On Sun, Jan 25, 2015 at 12:00:10PM -0500, Trond Myklebust wrote:
> commit 06bed7d18c2c07b3e3eeadf4bd357f6e806618cc upstream.
>
> 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: 9a1b6bf818e74 ("LOCKD: Don't call utsname()->nodename...")
> Cc: Bruce Fields <[email protected]>
> Cc: [email protected] # 3.10.x
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
>
> Fixed up to apply to 3.18 and older. Failure was due to a change in the
> surrounding code which does not invalidate the patch itself.
Thanks, Trond.
Signed-off-by: J. Bruce Fields <[email protected]>
--b.
>
> fs/lockd/svc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
> index d1bb7ecfd201..61024987f97b 100644
> --- a/fs/lockd/svc.c
> +++ b/fs/lockd/svc.c
> @@ -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, NULL);
> if (!serv) {
> printk(KERN_WARNING "lockd_up: create service failed\n");
> --
> 2.1.0
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
