SUNRPC: lock the socket while detaching it

Prevent callbacks from triggering while we're detaching the socket.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index dadfec66dbd8abd301fa3ac307431dabe7999ec6..abe2da602fb8cb7f33932133261302229140f3c1 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1611,9 +1611,12 @@ static void svc_sock_detach(struct svc_xprt *xprt)
        dprintk("svc: svc_sock_detach(%p)\n", svsk);
 
        /* put back the old socket callbacks */
+       lock_sock(sk);
        sk->sk_state_change = svsk->sk_ostate;
        sk->sk_data_ready = svsk->sk_odata;
        sk->sk_write_space = svsk->sk_owspace;
+       sk->sk_user_data = NULL;
+       release_sock(sk);
 
        wq = sk_sleep(sk);
        if (sunrpc_waitqueue_active(wq))