Commit 3a2b19d1 authored Nov 02, 2017 by Vasily Averin Committed by J. Bruce Fields Nov 27, 2017

lockd: lost rollback of set_grace_period() in lockd_down_net()



Commit efda760f ("lockd: fix lockd shutdown race") is incorrect,
it removes lockd_manager and disarm grace_period_end for init_net only.

If nfsd was started from another net namespace lockd_up_net() calls
set_grace_period() that adds lockd_manager into per-netns list
and queues grace_period_end delayed work.

These action should be reverted in lockd_down_net().
Otherwise it can lead to double list_add on after restart nfsd in netns,
and to use-after-free if non-disarmed delayed work will be executed after netns destroy.

Fixes: efda760f ("lockd: fix lockd shutdown race")
Cc: stable@vger.kernel.org
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent a3152f14

fs/lockd/svc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -274,6 +274,8 @@ static void lockd_down_net(struct svc_serv serv, struct net net)
		if (ln->nlmsvc_users) {
		if (--ln->nlmsvc_users == 0) {
		nlm_shutdown_hosts_net(net);
		cancel_delayed_work_sync(&ln->grace_period_end);
		locks_end_grace(&ln->lockd_manager);
		svc_shutdown_net(serv, net);
		dprintk("%s: per-net data destroyed; net=%x\n",
		__func__, net->ns.inum);

Admin message