diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2022-04-28 11:08:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-12 12:32:37 +0200 |
| commit | 4807f902910c576a1e00a86868a2542d959d1b47 (patch) | |
| tree | 73731f8278336e6a7fc430987fd79c8d87f930ab | |
| parent | 4fd6c1d43ffa7b92d4b1d3266159119443ccdbc3 (diff) | |
| download | linux-4807f902910c576a1e00a86868a2542d959d1b47.tar.gz linux-4807f902910c576a1e00a86868a2542d959d1b47.tar.bz2 linux-4807f902910c576a1e00a86868a2542d959d1b47.zip | |
SUNRPC: Don't leak sockets in xs_local_connect()
commit aad41a7d7cf6c6fa804c872a2480f8e541da37cf upstream.
If there is still a closed socket associated with the transport, then we
need to trigger an autoclose before we can set up a new connection.
Reported-by: wanghai (M) <wanghai38@huawei.com>
Fixes: f00432063db1 ("SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/sunrpc/xprtsock.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 2fc887733401..eec9569af4c5 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1967,6 +1967,9 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); int ret; + if (transport->file) + goto force_disconnect; + if (RPC_IS_ASYNC(task)) { /* * We want the AF_LOCAL connect to be resolved in the @@ -1979,11 +1982,17 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) */ task->tk_rpc_status = -ENOTCONN; rpc_exit(task, -ENOTCONN); - return; + goto out_wake; } ret = xs_local_setup_socket(transport); if (ret && !RPC_IS_SOFTCONN(task)) msleep_interruptible(15000); + return; +force_disconnect: + xprt_force_disconnect(xprt); +out_wake: + xprt_clear_connecting(xprt); + xprt_wake_pending_tasks(xprt, -ENOTCONN); } #if IS_ENABLED(CONFIG_SUNRPC_SWAP) |