[PATCH 4.6 056/203] SUNRPC: fix xprt leak on xps allocation failure

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.6 056/203] SUNRPC: fix xprt leak on xps allocation failure
Date	2016-07-25 23:40 +0200
Message-ID	<rYVLs-1mN-21@gated-at.bofh.it> (permalink)
References	<rYVs7-1c6-53@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

4.6-stable review patch.  If anyone has any objections, please let me know.

------------------

From: J. Bruce Fields <bfields@redhat.com>

commit 1208fd569c07ab84aa5d024abd863267c2953b4a upstream.

Callers of rpc_create_xprt expect it to put the xprt on success and
failure.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Acked-by: Trond Myklebust <trondmy@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/sunrpc/clnt.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -453,9 +453,10 @@ static struct rpc_clnt *rpc_create_xprt(
 	struct rpc_xprt_switch *xps;
 
 	xps = xprt_switch_alloc(xprt, GFP_KERNEL);
-	if (xps == NULL)
+	if (xps == NULL) {
+		xprt_put(xprt);
 		return ERR_PTR(-ENOMEM);
-
+	}
 	clnt = rpc_new_client(args, xps, xprt, NULL);
 	if (IS_ERR(clnt))
 		return clnt;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 4.6 056/203] SUNRPC: fix xprt leak on xps allocation failure Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-07-25 23:40 +0200

csiph-web