]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
xfrm: move xfrm_garbage_collect out of xfrm_policy_flush
authorHangbin Liu <liuhangbin@gmail.com>
Sun, 11 Jun 2017 01:44:20 +0000 (09:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jul 2017 12:41:40 +0000 (14:41 +0200)
commite0cee9f3bfdf3c8e84db231d0247132b4c30bc6e
tree397016b7c037f6e728e5cfbbb59dbd8cb184085e
parent4d03c6171114ed45d1267cf5d0f49d832de1e917
xfrm: move xfrm_garbage_collect out of xfrm_policy_flush

commit 138437f591dd9a42d53c6fed1a3c85e02678851c upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/key/af_key.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_user.c