summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2022-04-29 12:27:30 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-05-12 12:17:09 +0200
commita176498ec0767053a5fc279bcc8e1720a57e2eab (patch)
tree853ce245c105a3259e78fa9492d2c89a73a4a805
parent847499172a68a15329cead3b09ad5544b863beb1 (diff)
downloadlinux-a176498ec0767053a5fc279bcc8e1720a57e2eab.tar.gz
linux-a176498ec0767053a5fc279bcc8e1720a57e2eab.tar.bz2
linux-a176498ec0767053a5fc279bcc8e1720a57e2eab.zip
Revert "SUNRPC: attempt AF_LOCAL connect on setup"
commit a3d0562d4dc039bca39445e1cddde7951662e17d upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 5124a21ecfa3..1fd2939eb05d 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2941,9 +2941,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);