summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSu Yanjun <suyj.fnst@cn.fujitsu.com>2019-03-14 14:59:42 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-11 12:23:48 +0200
commit8fd94b65d20737b979e7d3a66d5573b91b0a9bd2 (patch)
treed36253b7161ecfbf5d816d6de03a07920b0d0b9e /net
parent86040d722b29976dfef0ef2b68eab832c358d04b (diff)
downloadlinux-stable-8fd94b65d20737b979e7d3a66d5573b91b0a9bd2.tar.gz
linux-stable-8fd94b65d20737b979e7d3a66d5573b91b0a9bd2.tar.bz2
linux-stable-8fd94b65d20737b979e7d3a66d5573b91b0a9bd2.zip
xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module
[ Upstream commit 6ee02a54ef990a71bf542b6f0a4e3321de9d9c66 ] When unloading xfrm6_tunnel module, xfrm6_tunnel_fini directly frees the xfrm6_tunnel_spi_kmem. Maybe someone has gotten the xfrm6_tunnel_spi, so need to wait it. Fixes: 91cc3bb0b04ff("xfrm6_tunnel: RCU conversion") Signed-off-by: Su Yanjun <suyj.fnst@cn.fujitsu.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/xfrm6_tunnel.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 56b72cada346..f9d493c59d6c 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -391,6 +391,10 @@ static void __exit xfrm6_tunnel_fini(void)
xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
unregister_pernet_subsys(&xfrm6_tunnel_net_ops);
+ /* Someone maybe has gotten the xfrm6_tunnel_spi.
+ * So need to wait it.
+ */
+ rcu_barrier();
kmem_cache_destroy(xfrm6_tunnel_spi_kmem);
}