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

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

From: J. Bruce Fields <[email protected]>

commit 1208fd569c07ab84aa5d024abd863267c2953b4a upstream.

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

Signed-off-by: J. Bruce Fields <[email protected]>
Acked-by: Trond Myklebust <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 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;


Reply via email to