| From 6feb7acb128c3ee225d1444fe5bca386b5bd0fa3 Mon Sep 17 00:00:00 2001 |
| From: Pavel Emelyanov <xemul@openvz.org> |
| Date: Thu, 26 Feb 2009 03:35:13 -0800 |
| Subject: ipv6: don't use tw net when accounting for recycled tw |
| |
| From: Pavel Emelyanov <xemul@openvz.org> |
| |
| [ Upstream commit 3f53a38131a4e7a053c0aa060aba0411242fb6b9 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/ipv6/inet6_hashtables.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv6/inet6_hashtables.c |
| +++ b/net/ipv6/inet6_hashtables.c |
| @@ -210,11 +210,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); |
| } |
