diff options
author | David S. Miller <davem@davemloft.net> | 2020-03-27 14:56:55 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-03-27 14:56:55 -0700 |
commit | e00dd941ff9fa6ed920da5ead95d2598170fe4ea (patch) | |
tree | 08abcd738b1db515debad3cd3559c3451beca21e /net/xfrm/xfrm_policy.c | |
parent | 8262e6f9b1034ede34548a04dec4c302d92c9497 (diff) | |
parent | 4c59406ed00379c8663f8663d82b2537467ce9d7 (diff) | |
download | linux-stable-e00dd941ff9fa6ed920da5ead95d2598170fe4ea.tar.gz linux-stable-e00dd941ff9fa6ed920da5ead95d2598170fe4ea.tar.bz2 linux-stable-e00dd941ff9fa6ed920da5ead95d2598170fe4ea.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2020-03-27
1) Handle NETDEV_UNREGISTER for xfrm device to handle asynchronous
unregister events cleanly. From Raed Salem.
2) Fix vti6 tunnel inter address family TX through bpf_redirect().
From Nicolas Dichtel.
3) Fix lenght check in verify_sec_ctx_len() to avoid a
slab-out-of-bounds. From Xin Long.
4) Add a missing verify_sec_ctx_len check in xfrm_add_acquire
to avoid a possible out-of-bounds to access. From Xin Long.
5) Use built-in RCU list checking of hlist_for_each_entry_rcu
to silence false lockdep warning in __xfrm6_tunnel_spi_lookup
when CONFIG_PROVE_RCU_LIST is enabled. From Madhuparna Bhowmik.
6) Fix a panic on esp offload when crypto is done asynchronously.
From Xin Long.
7) Fix a skb memory leak in an error path of vti6_rcv.
From Torsten Hilbrich.
8) Fix a race that can lead to a doulbe free in xfrm_policy_timer.
From Xin Long.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index dbda08ec566e..8a4af86a285e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -434,7 +434,9 @@ EXPORT_SYMBOL(xfrm_policy_destroy); static void xfrm_policy_kill(struct xfrm_policy *policy) { + write_lock_bh(&policy->lock); policy->walk.dead = 1; + write_unlock_bh(&policy->lock); atomic_inc(&policy->genid); |