From: Daniele Lacamera Date: Wed, 2 Jun 2010 02:02:04 +0000 (+0000) Subject: TCP: tcp_hybla: Fix integer overflow in slow start increment X-Git-Tag: v2.6.35-rc2~4^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edafe502404f3669d364b6e96d79b54067b634b4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 Signed-off-by: David S. Miller --- diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index c209e05..377bc93 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