[PATCH net] net: fix divide by zero in tcp algorithm illinois

Subsystems: networking [general], networking [tcp], the rest

STALE5092d

2 messages, 2 authors, 2012-10-31 · open the first message on its own page

[PATCH net] net: fix divide by zero in tcp algorithm illinois

From: Jesper Dangaard Brouer <hidden>
Date: 2012-10-31 10:36:02

Reading TCP stats when using TCP Illinois congestion control algorithm
can cause a divide by zero kernel oops.

The division by zero occur in tcp_illinois_info() at:
 do_div(t, ca->cnt_rtt);
where ca->cnt_rtt can become zero (when rtt_reset is called)

Steps to Reproduce:
 1. Register tcp_illinois:
     # sysctl -w net.ipv4.tcp_congestion_control=illinois
 2. Monitor internal TCP information via command "ss -i"
     # watch -d ss -i
 3. Establish new TCP conn to machine

Either it fails at the initial conn, or else it needs to wait
for a loss or a reset.

This is only related to reading stats.  The function avg_delay() also
performs the same divide, but is guarded with a (ca->cnt_rtt > 0) at its
calling point in update_params().  Thus, simply fix tcp_illinois_info().

To be on the safe side, I use a local stack variable in tcp_illinois_info()
to eliminate any race conditions.  I'm not sure this is needed, as this
would also affect avg_delay(), if this race exists.  (Although this is likely
already "fix" by compiler optimization and kept in a local register)

Cc: Petr Matousek <redacted>
Signed-off-by: Jesper Dangaard Brouer <redacted>
---

 net/ipv4/tcp_illinois.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 813b43a..343f160 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -306,6 +306,7 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
 			      struct sk_buff *skb)
 {
 	const struct illinois *ca = inet_csk_ca(sk);
+	u16 cnt_rtt;
 
 	if (ext & (1 << (INET_DIAG_VEGASINFO - 1))) {
 		struct tcpvegas_info info = {
@@ -315,8 +316,11 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
 		};
 		u64 t = ca->sum_rtt;
 
-		do_div(t, ca->cnt_rtt);
-		info.tcpv_rtt = t;
+		cnt_rtt = ca->cnt_rtt;
+		if (cnt_rtt > 0) {
+			do_div(t, cnt_rtt);
+			info.tcpv_rtt = t;
+		}
 
 		nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
 	}

Re: [PATCH net] net: fix divide by zero in tcp algorithm illinois

From: Eric Dumazet <hidden>
Date: 2012-10-31 11:17:25

On Wed, 2012-10-31 at 11:37 +0100, Jesper Dangaard Brouer wrote:
Reading TCP stats when using TCP Illinois congestion control algorithm
can cause a divide by zero kernel oops.

The division by zero occur in tcp_illinois_info() at:
 do_div(t, ca->cnt_rtt);
where ca->cnt_rtt can become zero (when rtt_reset is called)

Steps to Reproduce:
 1. Register tcp_illinois:
     # sysctl -w net.ipv4.tcp_congestion_control=illinois
 2. Monitor internal TCP information via command "ss -i"
     # watch -d ss -i
 3. Establish new TCP conn to machine

Either it fails at the initial conn, or else it needs to wait
for a loss or a reset.

This is only related to reading stats.  The function avg_delay() also
performs the same divide, but is guarded with a (ca->cnt_rtt > 0) at its
calling point in update_params().  Thus, simply fix tcp_illinois_info().
avg_delay() is called with socket locked so it is safe.

While get_info() is called with socket not locked.
To be on the safe side, I use a local stack variable in tcp_illinois_info()
to eliminate any race conditions.  I'm not sure this is needed, as this
would also affect avg_delay(), if this race exists.  (Although this is likely
already "fix" by compiler optimization and kept in a local register)
Hmm, this is certainly not a valid reason.

Compiler could do the reverse actually, even with a local var.

Could you please use info.tcpv_rttcnt to be on the safe side ?
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 813b43a..d92ae7e 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -313,11 +313,13 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
 			.tcpv_rttcnt = ca->cnt_rtt,
 			.tcpv_minrtt = ca->base_rtt,
 		};
-		u64 t = ca->sum_rtt;
 
-		do_div(t, ca->cnt_rtt);
-		info.tcpv_rtt = t;
+		if (info.tcpv_rttcnt) {
+			u64 t = ca->sum_rtt;
 
+			do_div(t, info.tcpv_rttcnt);
+			info.tcpv_rtt = t;
+		}
 		nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
 	}
 }
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help