Commit 3fade448 authored by Christopher Bednarz's avatar Christopher Bednarz Committed by Liu Jian
Browse files

RDMA/irdma: Prevent zero-length STAG registration 

mainline inclusion
from mainline-v6.6-rc1
commit bb6d73d9
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7YFVN
CVE: CVE-2023-25775

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



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

Currently irdma allows zero-length STAGs to be programmed in HW during
the kernel mode fast register flow. Zero-length MR or STAG registration
disable HW memory length checks.

Improve gaps in bounds checking in irdma by preventing zero-length STAG or
MR registrations except if the IB_PD_UNSAFE_GLOBAL_RKEY is set.

This addresses the disclosure CVE-2023-25775.

Fixes: b48c24c2 ("RDMA/irdma: Implement device supported verb APIs")
Signed-off-by: default avatarChristopher Bednarz <christopher.n.bednarz@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Link: https://lore.kernel.org/r/20230818144838.1758-1-shiraz.saleem@intel.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>

Conflicts:
	drivers/infiniband/hw/i40iw/i40iw_ctrl.c
	drivers/infiniband/hw/i40iw/i40iw_type.h
	drivers/infiniband/hw/i40iw/i40iw_verbs.c
	drivers/infiniband/hw/irdma/ctrl.c
	drivers/infiniband/hw/irdma/type.h
	drivers/infiniband/hw/irdma/verbs.c
parent e3e3b3c4

drivers/infiniband/hw/i40iw/i40iw_ctrl.c

+6 −0
Original line number Diff line number Diff line
@@ -3033,6 +3033,9 @@ static enum i40iw_status_code i40iw_sc_alloc_stag( 
	u64 header;

	enum i40iw_page_size page_size;



	if (!info->total_len && !info->all_memory)

		return -EINVAL;



	page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K;

	cqp = dev->cqp;

	wqe = i40iw_sc_cqp_get_next_send_wqe(cqp, scratch);
@@ -3091,6 +3094,9 @@ static enum i40iw_status_code i40iw_sc_mr_reg_non_shared( 
	u8 addr_type;

	enum i40iw_page_size page_size;



	if (!info->total_len && !info->all_memory)

		return -EINVAL;



	page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K;

	if (info->access_rights & (I40IW_ACCESS_FLAGS_REMOTEREAD_ONLY |

				   I40IW_ACCESS_FLAGS_REMOTEWRITE_ONLY))

drivers/infiniband/hw/i40iw/i40iw_type.h

+2 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ struct i40iw_allocate_stag_info { 
	bool use_hmc_fcn_index;

	u8 hmc_fcn_index;

	bool use_pf_rid;

	bool all_memory;

};



struct i40iw_reg_ns_stag_info {
@@ -804,6 +805,7 @@ struct i40iw_reg_ns_stag_info { 
	bool use_hmc_fcn_index;

	u8 hmc_fcn_index;

	bool use_pf_rid;

	bool all_memory;

};



struct i40iw_fast_reg_stag_info {

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+8 −2
Original line number Diff line number Diff line
@@ -1494,7 +1494,8 @@ static int i40iw_handle_q_mem(struct i40iw_device *iwdev, 
static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr)

{

	struct i40iw_allocate_stag_info *info;

	struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd);

	struct ib_pd *pd = iwmr->ibmr.pd;

	struct i40iw_pd *iwpd = to_iwpd(pd);

	enum i40iw_status_code status;

	int err = 0;

	struct i40iw_cqp_request *cqp_request;
@@ -1511,6 +1512,7 @@ static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr 
	info->stag_idx = iwmr->stag >> I40IW_CQPSQ_STAG_IDX_SHIFT;

	info->pd_id = iwpd->sc_pd.pd_id;

	info->total_len = iwmr->length;

	info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY;

	info->remote_access = true;

	cqp_info->cqp_cmd = OP_ALLOC_STAG;

	cqp_info->post_sq = 1;
@@ -1563,6 +1565,8 @@ static struct ib_mr *i40iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, 
	iwmr->type = IW_MEMREG_TYPE_MEM;

	palloc = &iwpbl->pble_alloc;

	iwmr->page_cnt = max_num_sg;

	/* Use system PAGE_SIZE as the sg page sizes are unknown at this point */

	iwmr->length = max_num_sg * PAGE_SIZE;

	mutex_lock(&iwdev->pbl_mutex);

	status = i40iw_get_pble(&iwdev->sc_dev, iwdev->pble_rsrc, palloc, iwmr->page_cnt);

	mutex_unlock(&iwdev->pbl_mutex);
@@ -1659,7 +1663,8 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, 
{

	struct i40iw_pbl *iwpbl = &iwmr->iwpbl;

	struct i40iw_reg_ns_stag_info *stag_info;

	struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd);

	struct ib_pd *pd = iwmr->ibmr.pd;

	struct i40iw_pd *iwpd = to_iwpd(pd);

	struct i40iw_pble_alloc *palloc = &iwpbl->pble_alloc;

	enum i40iw_status_code status;

	int err = 0;
@@ -1679,6 +1684,7 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, 
	stag_info->total_len = iwmr->length;

	stag_info->access_rights = access;

	stag_info->pd_id = iwpd->sc_pd.pd_id;

	stag_info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY;

	stag_info->addr_type = I40IW_ADDR_TYPE_VA_BASED;

	stag_info->page_size = iwmr->page_size;