Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233ba13d authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4f784484

net/sunrpc/xprtsock.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}