lkml.org 
[lkml]   [2016]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 65/96] lockd: unregister notifier blocks if the service fails to come up completely
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Scott Mayhew <smayhew@redhat.com>

    commit cb7d224f82e41d82518e7f9ea271d215d4d08e6e upstream.

    If the lockd service fails to start up then we need to be sure that the
    notifier blocks are not registered, otherwise a subsequent start of the
    service could cause the same notifier to be registered twice, leading to
    soft lockups.

    Signed-off-by: Scott Mayhew <smayhew@redhat.com>
    Fixes: 0751ddf77b6a "lockd: Register callbacks on the inetaddr_chain..."
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/lockd/svc.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    --- a/fs/lockd/svc.c
    +++ b/fs/lockd/svc.c
    @@ -335,12 +335,17 @@ static struct notifier_block lockd_inet6
    };
    #endif

    -static void lockd_svc_exit_thread(void)
    +static void lockd_unregister_notifiers(void)
    {
    unregister_inetaddr_notifier(&lockd_inetaddr_notifier);
    #if IS_ENABLED(CONFIG_IPV6)
    unregister_inet6addr_notifier(&lockd_inet6addr_notifier);
    #endif
    +}
    +
    +static void lockd_svc_exit_thread(void)
    +{
    + lockd_unregister_notifiers();
    svc_exit_thread(nlmsvc_rqst);
    }

    @@ -462,7 +467,7 @@ int lockd_up(struct net *net)
    * Note: svc_serv structures have an initial use count of 1,
    * so we exit through here on both success and failure.
    */
    -err_net:
    +err_put:
    svc_destroy(serv);
    err_create:
    mutex_unlock(&nlmsvc_mutex);
    @@ -470,7 +475,9 @@ err_create:

    err_start:
    lockd_down_net(serv, net);
    - goto err_net;
    +err_net:
    + lockd_unregister_notifiers();
    + goto err_put;
    }
    EXPORT_SYMBOL_GPL(lockd_up);


    \
     
     \ /
      Last update: 2016-08-08 22:21    [W:4.072 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site