Commit 84d86ed9 authored by Jianglei Nie's avatar Jianglei Nie Committed by Zheng Zengkai
Browse files

RDMA/qedr: Fix potential memory leak in __qedr_alloc_mr() 

stable inclusion
from stable-v5.10.137
commit 79ce50dddaf28b5c57911ecc80a2be17a0b17f83
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=79ce50dddaf28b5c57911ecc80a2be17a0b17f83

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

[ Upstream commit b3236a64 ]

__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: e0290cce ("qedr: Add support for memory registeration verbs")
Link: https://lore.kernel.org/r/20220714061505.2342759-1-niejianglei2021@163.com


Signed-off-by: default avatarJianglei Nie <niejianglei2021@163.com>
Acked-by: default avatarMichal <Kalderon&nbsp;&lt;michal.kalderon@marvell.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 27a1aec5

drivers/infiniband/hw/qedr/verbs.c

+5 −3
Original line number Diff line number Diff line
@@ -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);