lkml.org 
[lkml]   [2019]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 29/83] xprtrdma: Double free in rpcrdma_sendctxs_create()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 6e17f58c486d9554341f70aa5b63b8fbed07b3fa ]

    The clean up is handled by the caller, rpcrdma_buffer_create(), so this
    call to rpcrdma_sendctxs_destroy() leads to a double free.

    Fixes: ae72950abf99 ("xprtrdma: Add data structure to manage RDMA Send arguments")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/sunrpc/xprtrdma/verbs.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
    index 956a5ea47b58..3d6bf790cf1f 100644
    --- a/net/sunrpc/xprtrdma/verbs.c
    +++ b/net/sunrpc/xprtrdma/verbs.c
    @@ -872,7 +872,7 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt)
    for (i = 0; i <= buf->rb_sc_last; i++) {
    sc = rpcrdma_sendctx_create(&r_xprt->rx_ia);
    if (!sc)
    - goto out_destroy;
    + return -ENOMEM;

    sc->sc_xprt = r_xprt;
    buf->rb_sc_ctxs[i] = sc;
    @@ -880,10 +880,6 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt)
    buf->rb_flags = 0;

    return 0;
    -
    -out_destroy:
    - rpcrdma_sendctxs_destroy(buf);
    - return -ENOMEM;
    }

    /* The sendctx queue is not guaranteed to have a size that is a
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-13 03:56    [W:2.289 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site