Commit 6218fe18 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: avoid synchronize_rcu during netns destruction 



Use the new exit_pre hook to NULL the netlink socket.
The net namespace core will do a synchronize_rcu() between the exit_pre
and exit/exit_batch handlers.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 7baf867f

net/xfrm/xfrm_user.c

+7 −3
Original line number Diff line number Diff line
@@ -3480,18 +3480,22 @@ static int __net_init xfrm_user_net_init(struct net *net) 
	return 0;

}



static void __net_exit xfrm_user_net_pre_exit(struct net *net)

{

	RCU_INIT_POINTER(net->xfrm.nlsk, NULL);

}



static void __net_exit xfrm_user_net_exit(struct list_head *net_exit_list)

{

	struct net *net;

	list_for_each_entry(net, net_exit_list, exit_list)

		RCU_INIT_POINTER(net->xfrm.nlsk, NULL);

	synchronize_net();



	list_for_each_entry(net, net_exit_list, exit_list)

		netlink_kernel_release(net->xfrm.nlsk_stash);

}



static struct pernet_operations xfrm_user_net_ops = {

	.init	    = xfrm_user_net_init,

	.pre_exit   = xfrm_user_net_pre_exit,

	.exit_batch = xfrm_user_net_exit,

};