Skip to contentSkip to conversation

ipv6: don't use tw net when accounting for recycled tw

PATCH In review Pavel Emelyanov 2 participants 2 messages Feb 26, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipv6: don't use tw net when accounting for recycled tw

We already have a valid net in that place, but this is not just a cleanup - the tw pointer can be NULL there sometimes, thus causing an oops in NET_NS=y case.

The same place in ipv4 code already works correctly using existing net, rather than tw's one.

The bug exists since 2.6.27.

---

net/ipv6/inet6_hashtables.c +2 -2
index 8fe267f..1bcc343 100644
@@ -258,11 +258,11 @@ unique:
 
 	if (twp != NULL) {
 		*twp = tw;
-		NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED);
+		NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
 	} else if (tw != NULL) {
 		/* Silly. Should hash-dance instead... */
 		inet_twsk_deschedule(tw, death_row);
-		NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED);
+		NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
 
 		inet_twsk_put(tw);
 	}
maintainer
#1 lore raw

From: Pavel Emelyanov <[email protected]>
Date: Thu, 26 Feb 2009 14:31:55 +0300

Quoted 10 lines

We already have a valid net in that place, but this is not just a cleanup - the tw pointer can be NULL there sometimes, thus causing an oops in NET_NS=y case.

The same place in ipv4 code already works correctly using existing net, rather than tw's one.

The bug exists since 2.6.27.

Applied and queued up for -stable, thanks!