diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2009-02-26 03:35:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 03:35:13 -0800 |
| commit | 3f53a38131a4e7a053c0aa060aba0411242fb6b9 (patch) | |
| tree | 123310cd7b3677ace9ab77daebd86f30ca280cc4 /net | |
| parent | 0c9a3aaaf30e1d1994de58c554ef97a719e20892 (diff) | |
| download | linux-3f53a38131a4e7a053c0aa060aba0411242fb6b9.tar.gz linux-3f53a38131a4e7a053c0aa060aba0411242fb6b9.tar.bz2 linux-3f53a38131a4e7a053c0aa060aba0411242fb6b9.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 8fe267feb81e..1bcc3431859e 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -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); } |