summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2017-06-11 09:44:20 +0800
committerSteffen Klassert <steffen.klassert@secunet.com>2017-06-12 11:51:21 +0200
commit138437f591dd9a42d53c6fed1a3c85e02678851c (patch)
treeb2ab938ab6fb1958f50067f1252968af9ef88162 /net/key
parentb81f884a547b5c264c13fdfaa3b65cf994bf1dcf (diff)
downloadlinux-138437f591dd9a42d53c6fed1a3c85e02678851c.tar.gz
linux-138437f591dd9a42d53c6fed1a3c85e02678851c.tar.bz2
linux-138437f591dd9a42d53c6fed1a3c85e02678851c.zip
xfrm: move xfrm_garbage_collect out of xfrm_policy_flush
Now we will force to do garbage collection if any policy removed in xfrm_policy_flush(). But during xfrm_net_exit(). We call flow_cache_fini() first and set set fc->percpu to NULL. Then after we call xfrm_policy_fini() -> frxm_policy_flush() -> flow_cache_flush(), we will get NULL pointer dereference when check percpu_empty. The code path looks like: flow_cache_fini() - fc->percpu = NULL xfrm_policy_fini() - xfrm_policy_flush() - xfrm_garbage_collect() - flow_cache_flush() - flow_cache_percpu_empty() - fcp = per_cpu_ptr(fc->percpu, cpu) To reproduce, just add ipsec in netns and then remove the netns. v2: As Xin Long suggested, since only two other places need to call it. move xfrm_garbage_collect() outside xfrm_policy_flush(). v3: Fix subject mismatch after v2 fix. Fixes: 35db06912189 ("xfrm: do the garbage collection after flushing policy") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 512dc43d0ce6..5103f92e2eb0 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2755,6 +2755,8 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, const struct sad
int err, err2;
err = xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, true);
+ if (!err)
+ xfrm_garbage_collect(net);
err2 = unicast_flush_resp(sk, hdr);
if (err || err2) {
if (err == -ESRCH) /* empty table - old silent behavior */