summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-03 09:29:24 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-03 09:29:24 +0100
commit22d55328b7d27694718f5d64a53d2bddbbe173a5 (patch)
tree9bb8ecd03fadca07b5887006fbd59ddaa0114bf1
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma... (diff)
parentxfrm: Fix kernel panic when flush and dump SPD entries (diff)
downloadlinux-22d55328b7d27694718f5d64a53d2bddbbe173a5.tar.xz
linux-22d55328b7d27694718f5d64a53d2bddbbe173a5.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
-rw-r--r--net/xfrm/xfrm_policy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 393cc65dbfa4..62a49a1f2475 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -799,6 +799,7 @@ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
continue;
hlist_del(&pol->bydst);
hlist_del(&pol->byidx);
+ list_del(&pol->walk.all);
write_unlock_bh(&xfrm_policy_lock);
xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,