ipv6: don't use tw net when accounting for recycled tw
Subsystems (3)
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.
Signed-off-by Pavel Emelyanov <[email protected]>
---
net/ipv6/inet6_hashtables.c +2 -2
@@ -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); }
David Miller
maintainerFrom: 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.
Signed-off-by Pavel Emelyanov <[email protected]>
Applied and queued up for -stable, thanks!