aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2022-04-29 12:27:30 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2022-04-29 20:38:27 -0400
commita3d0562d4dc039bca39445e1cddde7951662e17d (patch)
tree4bdeaf7a39b2ee413db40b4d93f57b628149931b
parentSUNRPC: Ensure gss-proxy connects on setup (diff)
downloadlinux-dev-a3d0562d4dc039bca39445e1cddde7951662e17d.tar.xz
linux-dev-a3d0562d4dc039bca39445e1cddde7951662e17d.zip
Revert "SUNRPC: attempt AF_LOCAL connect on setup"
This reverts commit 7073ea8799a8cf73db60270986f14e4aae20fa80. 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: wanghai (M) <wanghai38@huawei.com> Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
-rw-r--r--net/sunrpc/xprtsock.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 25b8a8ead56b..650102a9c86a 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2875,9 +2875,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);