diff mbox

TCP: tcp_hybla: Fix integer overflow in slow start increment

Message ID 1275480124-24383-1-git-send-email-root@danielinux.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Daniele Lacamera June 2, 2010, 12:02 p.m. UTC 
From: root <root@kitchen.(none)>

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>
---
 net/ipv4/tcp_hybla.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller June 2, 2010, 2:16 p.m. UTC | #1 
From: Daniele Lacamera <root@danielinux.net>
Date: Wed,  2 Jun 2010 14:02:04 +0200

> From: root <root@kitchen.(none)>

Please do not include incomplete authorship tags in your patch postings
like this, I used the more complete one from your email headers.

> 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>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c
index c209e05..8db01d4 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