diff options
| author | Daniele Lacamera <root@danielinux.net> | 2010-06-02 04:02:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-02 16:15:48 +0200 |
| commit | edafe502404f3669d364b6e96d79b54067b634b4 (patch) | |
| tree | ef3c1a3921e20b2dc40938f2de23e893a6a53c4a /net/ipv4/tcp_hybla.c | |
| parent | act_nat: fix the wrong checksum when addr isn't in old_addr/mask (diff) | |
| download | linux-edafe502404f3669d364b6e96d79b54067b634b4.tar.xz linux-edafe502404f3669d364b6e96d79b54067b634b4.zip | |
TCP: tcp_hybla: Fix integer overflow in slow start increment
For large values of rtt, 2^rho operation may overflow u32. Clamp down the increment to 2^16.
Signed-off-by: Daniele Lacamera <root@danielinux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_hybla.c')
| -rw-r--r-- | net/ipv4/tcp_hybla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index c209e054a634..377bc9349371 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c @@ -126,8 +126,8 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) * calculate 2^fract in a <<7 value. */ is_slowstart = 1; - increment = ((1 << ca->rho) * hybla_fraction(rho_fractions)) - - 128; + increment = ((1 << min(ca->rho, 16U)) * + hybla_fraction(rho_fractions)) - 128; } else { /* * congestion avoidance |