Patch "lockd: double unregister of inetaddr notifiers" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
lockd: double unregister of inetaddr notifiers
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
lockd-double-unregister-of-inetaddr-notifiers.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
dc3033e16c59a2c4e62b31341258a5786cbcee56Mon Sep 17 00:00:00 2001
From: Vasily Averin <[email protected]>
Date: Fri, 20 Oct 2017 17:33:18 +0300
Subject: lockd: double unregister of inetaddr notifiers
From: Vasily Averin <[email protected]>
commit dc3033e16c59a2c4e62b31341258a5786cbcee56 upstream.
lockd_up() can call lockd_unregister_notifiers twice:
inside lockd_start_svc() when it calls lockd_svc_exit_thread() and then in error path of lockd_up()
Patch forces lockd_start_svc() to unregister notifiers in all error cases and removes extra unregister in error path of lockd_up().
--- fs/lockd/svc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
fs/lockd/svc.c +9 -11
@@ -369,6 +369,7 @@ static int lockd_start_svc(struct svc_seprintk (KERN_WARNING "lockd_up: svc_rqst allocation failed, error=%d\n" , error); +lockd_unregister_notifiers (); goto out_rqst; }
@@ -459,13 +460,16 @@ int lockd_up(struct net *net) } error =lockd_up_net (serv, net); -if (error <0 ) - goto err_net; +if (error <0 ) { +lockd_unregister_notifiers (); + goto err_put; + } error =lockd_start_svc (serv); -if (error <0 ) - goto err_start; - +if (error <0 ) { +lockd_down_net (serv, net); + goto err_put; + } nlmsvc_users++;/* * Note: svc_serv structures have an initial use count of 1,
@@ -476,12 +480,6 @@ err_put: err_create:mutex_unlock (&nlmsvc_mutex);return error; - -err_start: -lockd_down_net (serv, net); -err_net: -lockd_unregister_notifiers (); - goto err_put; }EXPORT_SYMBOL_GPL (lockd_up);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/lockd-double-unregister-of-inetaddr-notifiers.patch