Commit 3f53a381 authored Feb 26, 2009 by Pavel Emelyanov Committed by David S. Miller Feb 26, 2009

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.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0c9a3aaa

net/ipv6/inet6_hashtables.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message