summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorMiroslav Urbanek <mu@miroslavurbanek.com>2015-02-05 16:36:50 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-18 14:10:48 +0100
commit3ec37c5e28b90c8f9f5173c0a7a61d513684f7b5 (patch)
tree84c6eae4971af0e5b289677cdb507b862cd5e2e6 /net/core
parent5392bc6bce5ff16ca78d7d3780bde272f9119bb8 (diff)
flowcache: Fix kernel panic in flow_cache_flush_task
[ Upstream commit 233c96fc077d310772375d47522fb444ff546905 ] flow_cache_flush_task references a structure member flow_cache_gc_work where it should reference flow_cache_flush_task instead. Kernel panic occurs on kernels using IPsec during XFRM garbage collection. The garbage collection interval can be shortened using the following sysctl settings: net.ipv4.xfrm4_gc_thresh=4 net.ipv6.xfrm6_gc_thresh=4 With the default settings, our productions servers crash approximately once a week. With the settings above, they crash immediately. Fixes: ca925cf1534e ("flowcache: Make flow cache name space aware") Reported-by: Tomáš Charvát <tc@excello.cz> Tested-by: Jan Hejl <jh@excello.cz> Signed-off-by: Miroslav Urbanek <mu@miroslavurbanek.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/flow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow.c b/net/core/flow.c
index a0348fde1fdf..1033725be40b 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -379,7 +379,7 @@ done:
static void flow_cache_flush_task(struct work_struct *work)
{
struct netns_xfrm *xfrm = container_of(work, struct netns_xfrm,
- flow_cache_gc_work);
+ flow_cache_flush_work);
struct net *net = container_of(xfrm, struct net, xfrm);
flow_cache_flush(net);