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

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

Revert "SUNRPC: attempt AF_LOCAL connect on setup" 



commit a3d0562d4dc039bca39445e1cddde7951662e17d upstream.

This reverts commit 7073ea87.

We must not try to connect the socket while the transport is under
construction, because the mechanisms to safely tear it down are not in
place. As the code stands, we end up leaking the sockets on a connection
error.

Reported-by: default avatarwanghai (M) <wanghai38@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d403ff32

net/sunrpc/xprtsock.c

+0 −3
Original line number Diff line number Diff line
@@ -2963,9 +2963,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args) 
		}

		xprt_set_bound(xprt);

		xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);

		ret = ERR_PTR(xs_local_setup_socket(transport));

		if (ret)

			goto out_err;

		break;

	default:

		ret = ERR_PTR(-EAFNOSUPPORT);