Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06bed7d1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

LOCKD: Fix a race when initialising nlmsvc_timeout 



This commit fixes a race whereby nlmclnt_init() first starts the lockd
daemon, and then calls nlm_bind_host() with the expectation that
nlmsvc_timeout has already been initialised. Unfortunately, there is no
no synchronisation between lockd() and lockd_up() to guarantee that this
is the case.

Fix is to move the initialisation of nlmsvc_timeout into lockd_create_svc

Fixes: 9a1b6bf8 ("LOCKD: Don't call utsname()->nodename...")
Cc: Bruce Fields <bfields@fieldses.org>
Cc: stable@vger.kernel.org # 3.10.x
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent b1940cd2

fs/lockd/svc.c

+4 −4
Original line number Diff line number Diff line
@@ -138,10 +138,6 @@ lockd(void *vrqstp) 


	dprintk("NFS locking service started (ver " LOCKD_VERSION ").\n");



	if (!nlm_timeout)

		nlm_timeout = LOCKD_DFLT_TIMEO;

	nlmsvc_timeout = nlm_timeout * HZ;



	/*

	 * The main request loop. We don't terminate until the last

	 * NFS mount or NFS daemon has gone away.
@@ -350,6 +346,10 @@ static struct svc_serv *lockd_create_svc(void) 
		printk(KERN_WARNING

			"lockd_up: no pid, %d users??\n", nlmsvc_users);



	if (!nlm_timeout)

		nlm_timeout = LOCKD_DFLT_TIMEO;

	nlmsvc_timeout = nlm_timeout * HZ;



	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, svc_rpcb_cleanup);

	if (!serv) {

		printk(KERN_WARNING "lockd_up: create service failed\n");