xprtrdma: Fix double-free in rpcrdma_ep_create()
authorChuck Lever <chuck.lever@oracle.com>
Sat, 27 Jun 2020 16:35:04 +0000 (12:35 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Mon, 13 Jul 2020 14:50:41 +0000 (10:50 -0400)
In the error paths, there's no need to call kfree(ep) after calling
rpcrdma_ep_put(ep).

Fixes: e28ce90083f0 ("xprtrdma: kmalloc rpcrdma_ep separate from rpcrdma_xprt")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
net/sunrpc/xprtrdma/verbs.c

index 2198c8e..e4c0df7 100644 (file)
@@ -406,8 +406,8 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt)
 
        id = rpcrdma_create_id(r_xprt, ep);
        if (IS_ERR(id)) {
-               rc = PTR_ERR(id);
-               goto out_free;
+               kfree(ep);
+               return PTR_ERR(id);
        }
        __module_get(THIS_MODULE);
        device = id->device;
@@ -506,9 +506,6 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt)
 out_destroy:
        rpcrdma_ep_put(ep);
        rdma_destroy_id(id);
-out_free:
-       kfree(ep);
-       r_xprt->rx_ep = NULL;
        return rc;
 }