lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 336/545] RDMA/qedr: Fix potential memory leak in __qedr_alloc_mr()
    Date
    From: Jianglei Nie <niejianglei2021@163.com>

    [ Upstream commit b3236a64ddd125a455ef5b5316c1b9051b732974 ]

    __qedr_alloc_mr() allocates a memory chunk for "mr->info.pbl_table" with
    init_mr_info(). When rdma_alloc_tid() and rdma_register_tid() fail, "mr"
    is released while "mr->info.pbl_table" is not released, which will lead
    to a memory leak.

    We should release the "mr->info.pbl_table" with qedr_free_pbl() when error
    occurs to fix the memory leak.

    Fixes: e0290cce6ac0 ("qedr: Add support for memory registeration verbs")
    Link: https://lore.kernel.org/r/20220714061505.2342759-1-niejianglei2021@163.com
    Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
    Acked-by: Michal Kalderon <michal.kalderon@marvell.com>
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/qedr/verbs.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
    index bffacb47ea0e..3543b9af10b7 100644
    --- a/drivers/infiniband/hw/qedr/verbs.c
    +++ b/drivers/infiniband/hw/qedr/verbs.c
    @@ -3093,7 +3093,7 @@ static struct qedr_mr *__qedr_alloc_mr(struct ib_pd *ibpd,
    else
    DP_ERR(dev, "roce alloc tid returned error %d\n", rc);

    - goto err0;
    + goto err1;
    }

    /* Index only, 18 bit long, lkey = itid << 8 | key */
    @@ -3117,7 +3117,7 @@ static struct qedr_mr *__qedr_alloc_mr(struct ib_pd *ibpd,
    rc = dev->ops->rdma_register_tid(dev->rdma_ctx, &mr->hw_mr);
    if (rc) {
    DP_ERR(dev, "roce register tid returned an error %d\n", rc);
    - goto err1;
    + goto err2;
    }

    mr->ibmr.lkey = mr->hw_mr.itid << 8 | mr->hw_mr.key;
    @@ -3126,8 +3126,10 @@ static struct qedr_mr *__qedr_alloc_mr(struct ib_pd *ibpd,
    DP_DEBUG(dev, QEDR_MSG_MR, "alloc frmr: %x\n", mr->ibmr.lkey);
    return mr;

    -err1:
    +err2:
    dev->ops->rdma_free_tid(dev->rdma_ctx, mr->hw_mr.itid);
    +err1:
    + qedr_free_pbl(dev, &mr->info.pbl_info, mr->info.pbl_table);
    err0:
    kfree(mr);
    return ERR_PTR(rc);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:27    [W:4.068 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site