diff options
author | Christoph Paasch <christoph.paasch@uclouvain.be> | 2014-07-29 12:07:27 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:48 +0100 |
commit | a16f7f29b9f02d0eda37675fb01d8d6aa54e892d (patch) | |
tree | 02aab22d35cb910c3b957525658200f588ca3a35 /net/ipv4 | |
parent | bf63acfdbf5c15e482a0b31043d666f3d3b1cf30 (diff) | |
download | kernel_samsung_smdk4412-a16f7f29b9f02d0eda37675fb01d8d6aa54e892d.zip kernel_samsung_smdk4412-a16f7f29b9f02d0eda37675fb01d8d6aa54e892d.tar.gz kernel_samsung_smdk4412-a16f7f29b9f02d0eda37675fb01d8d6aa54e892d.tar.bz2 |
tcp: Fix integer-overflows in TCP veno
[ Upstream commit 45a07695bc64b3ab5d6d2215f9677e5b8c05a7d0 ]
In veno 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.
A first attempt at fixing 76f1017757aa0 ([TCP]: TCP Veno congestion
control) was made by 159131149c2 (tcp: Overflow bug in Vegas), but it
failed to add the required cast in tcp_veno_cong_avoid().
Fixes: 76f1017757aa0 ([TCP]: TCP Veno congestion control)
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_veno.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c index ac43cd7..b4d1858 100644 --- a/net/ipv4/tcp_veno.c +++ b/net/ipv4/tcp_veno.c @@ -144,7 +144,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) rtt = veno->minrtt; - target_cwnd = (tp->snd_cwnd * veno->basertt); + target_cwnd = (u64)tp->snd_cwnd * veno->basertt; target_cwnd <<= V_PARAM_SHIFT; do_div(target_cwnd, rtt); |