Commit 9d93f862 authored by Chengchang Tang's avatar Chengchang Tang Committed by Juan Zhou
Browse files

RDMA/hns: Remove unnecessary checks for NULL in mtr_alloc_bufs() 

mainline inclusion
from mainline-v6.8-rc1
commit f31683a5227b1a0febae8e2a85d7fdf9514c10f1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I90X3R
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f31683a5227b1a0febae8e2a85d7fdf9514c10f1



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

ib_umem_get() never return NULL.

Fixes: 3c873161 ("RDMA/hns: Add support for addressing when hopnum is 0")
Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20231207114231.2872104-5-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent 445c33f1

drivers/infiniband/hw/hns/hns_roce_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static int mtr_alloc_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		mtr->kmem = NULL;

		mtr->umem = ib_umem_get(ibdev, user_addr, total_size,

					buf_attr->user_access);

		if (IS_ERR_OR_NULL(mtr->umem)) {

		if (IS_ERR(mtr->umem)) {

			ibdev_err(ibdev, "failed to get umem, ret = %ld.\n",

				  PTR_ERR(mtr->umem));

			return -ENOMEM;