summaryrefslogtreecommitdiff
authorSu Yanjun <suyj.fnst@cn.fujitsu.com>2019-03-14 06:59:42 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 16:26:54 (GMT)
commiteaa8cf570008043c6f093d7f1ec102f78b9d3c69 (patch)
treeb173d9f2e52ecbbfb780c723656adfbf828d1512
parent7c96721f56b02fdf7b191aee0d39690ab4f40dc5 (diff)
downloadcommon-eaa8cf570008043c6f093d7f1ec102f78b9d3c69.zip
common-eaa8cf570008043c6f093d7f1ec102f78b9d3c69.tar.gz
common-eaa8cf570008043c6f093d7f1ec102f78b9d3c69.tar.bz2
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
-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 3a2701d..07b7b25 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);
}