summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-06-24 16:55:47 +0200
committerJ. Bruce Fields <bfields@redhat.com>2016-07-13 21:53:44 +0200
commit069c225b88202c84bdbe18bed9e30e77924fdd0a (patch)
tree2518e0a9a9a74ff4b5f23e797424c8c27b46e95b /net
parentSUNRPC: Add tracepoints for dropped and deferred requests (diff)
downloadlinux-069c225b88202c84bdbe18bed9e30e77924fdd0a.tar.xz
linux-069c225b88202c84bdbe18bed9e30e77924fdd0a.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/svcsock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index dadfec66dbd8..abe2da602fb8 100644
--- 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))