diff options
author | Eric Dumazet <edumazet@google.com> | 2017-05-01 18:29:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-14 08:00:21 -0400 |
commit | 91260baa9d673bc7b4e0ca95d94e2b086a597773 (patch) | |
tree | d013b25426fcb0bcf475f44f31153b1ce241cccc | |
parent | 493d0a7be31caba12734942d14fa28bed389862a (diff) |
tcp: fix wraparound issue in tcp_lp
[ Upstream commit a9f11f963a546fea9144f6a6d1a307e814a387e7 ]
Be careful when comparing tcp_time_stamp to some u32 quantity,
otherwise result can be surprising.
Fixes: 7c106d7e782b ("[TCP]: TCP Low Priority congestion control")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/ipv4/tcp_lp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c index c67ece1390c2..7d86fc505397 100644 --- a/net/ipv4/tcp_lp.c +++ b/net/ipv4/tcp_lp.c | |||
@@ -264,13 +264,15 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample) | |||
264 | { | 264 | { |
265 | struct tcp_sock *tp = tcp_sk(sk); | 265 | struct tcp_sock *tp = tcp_sk(sk); |
266 | struct lp *lp = inet_csk_ca(sk); | 266 | struct lp *lp = inet_csk_ca(sk); |
267 | u32 delta; | ||
267 | 268 | ||
268 | if (sample->rtt_us > 0) | 269 | if (sample->rtt_us > 0) |
269 | tcp_lp_rtt_sample(sk, sample->rtt_us); | 270 | tcp_lp_rtt_sample(sk, sample->rtt_us); |
270 | 271 | ||
271 | /* calc inference */ | 272 | /* calc inference */ |
272 | if (tcp_time_stamp > tp->rx_opt.rcv_tsecr) | 273 | delta = tcp_time_stamp - tp->rx_opt.rcv_tsecr; |
273 | lp->inference = 3 * (tcp_time_stamp - tp->rx_opt.rcv_tsecr); | 274 | if ((s32)delta > 0) |
275 | lp->inference = 3 * delta; | ||
274 | 276 | ||
275 | /* test if within inference */ | 277 | /* test if within inference */ |
276 | if (lp->last_drop && (tcp_time_stamp - lp->last_drop < lp->inference)) | 278 | if (lp->last_drop && (tcp_time_stamp - lp->last_drop < lp->inference)) |