diff options
| author | Trond Myklebust | 2018-12-17 23:38:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-13 09:51:01 +0100 |
| commit | 233ba13db681749b9a02e3c6179efea5e364bb04 (patch) | |
| tree | 2504aec774067f095e0ade8aaf000db65eef6257 /net/sunrpc | |
| parent | mac80211: fix a kernel panic when TXing after TXQ teardown (diff) | |
| download | kernel-qcow2-linux-233ba13db681749b9a02e3c6179efea5e364bb04.tar.gz kernel-qcow2-linux-233ba13db681749b9a02e3c6179efea5e364bb04.tar.xz kernel-qcow2-linux-233ba13db681749b9a02e3c6179efea5e364bb04.zip | |
SUNRPC: Fix a race with XPRT_CONNECTING
[ Upstream commit cf76785d30712d90185455e752337acdb53d2a5d ]
Ensure that we clear XPRT_CONNECTING before releasing the XPRT_LOCK so that
we don't have races between the (asynchronous) socket setup code and
tasks in xprt_connect().
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 6b7539c0466e..7d8cce1dfcad 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2244,8 +2244,8 @@ static void xs_udp_setup_socket(struct work_struct *work) trace_rpc_socket_connect(xprt, sock, 0); status = 0; out: - xprt_unlock_connect(xprt, transport); xprt_clear_connecting(xprt); + xprt_unlock_connect(xprt, transport); xprt_wake_pending_tasks(xprt, status); } @@ -2480,8 +2480,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) } status = -EAGAIN; out: - xprt_unlock_connect(xprt, transport); xprt_clear_connecting(xprt); + xprt_unlock_connect(xprt, transport); xprt_wake_pending_tasks(xprt, status); } |