Skip to content

Commit 1f74e61

Browse files
Christoph Paaschdavem330
Christoph Paasch
authored andcommitted
tcp: Fix integer-overflow in TCP vegas
In vegas we do a multiplication of the cwnd and the rtt. This may overflow and thus their result is stored in a u64. However, we first need to cast the cwnd so that actually 64-bit arithmetic is done. Then, we need to do do_div to allow this to be used on 32-bit arches. Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Neal Cardwell <ncardwell@google.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: David Laight <David.Laight@ACULAB.COM> Cc: Doug Leith <doug.leith@nuim.ie> Fixes: 8d3a564 (tcp: tcp_vegas cong avoid fix) Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 45a0769 commit 1f74e61

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/ipv4/tcp_vegas.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)
218218
* This is:
219219
* (actual rate in segments) * baseRTT
220220
*/
221-
target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt;
221+
target_cwnd = (u64)tp->snd_cwnd * vegas->baseRTT;
222+
do_div(target_cwnd, rtt);
222223

223224
/* Calculate the difference between the window we had,
224225
* and the window we would like to have. This quantity

0 commit comments

Comments
 (0)