4.19-stable patches

added patches:
	rdma-irdma-prevent-zero-length-stag-registration.patch

diff --git a/queue-4.19/rdma-irdma-prevent-zero-length-stag-registration.patch b/queue-4.19/rdma-irdma-prevent-zero-length-stag-registration.patch
new file mode 100644 (file)
index 0000000..9be831c
--- /dev/null
+++ b/queue-4.19/rdma-irdma-prevent-zero-length-stag-registration.patch
@@ -0,0 +1,117 @@
+From bb6d73d9add68ad270888db327514384dfa44958 Mon Sep 17 00:00:00 2001
+From: Christopher Bednarz <christopher.n.bednarz@intel.com>
+Date: Fri, 18 Aug 2023 09:48:38 -0500
+Subject: RDMA/irdma: Prevent zero-length STAG registration
+
+From: Christopher Bednarz <christopher.n.bednarz@intel.com>
+
+commit bb6d73d9add68ad270888db327514384dfa44958 upstream.
+
+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: b48c24c2d710 ("RDMA/irdma: Implement device supported verb APIs")
+Signed-off-by: Christopher Bednarz <christopher.n.bednarz@intel.com>
+Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
+Link: https://lore.kernel.org/r/20230818144838.1758-1-shiraz.saleem@intel.com
+Signed-off-by: Leon Romanovsky <leon@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/hw/i40iw/i40iw_ctrl.c  |    6 ++++++
+ drivers/infiniband/hw/i40iw/i40iw_type.h  |    2 ++
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c |   10 ++++++++--
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+--- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
++++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
+@@ -2945,6 +2945,9 @@ static enum i40iw_status_code i40iw_sc_a
+       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);
+@@ -3003,6 +3006,9 @@ static enum i40iw_status_code i40iw_sc_m
+       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))
+--- a/drivers/infiniband/hw/i40iw/i40iw_type.h
++++ b/drivers/infiniband/hw/i40iw/i40iw_type.h
+@@ -779,6 +779,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 {
+@@ -797,6 +798,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 {
+--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
++++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+@@ -1581,7 +1581,8 @@ static int i40iw_handle_q_mem(struct i40
+ 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;
+@@ -1598,6 +1599,7 @@ static int i40iw_hw_alloc_stag(struct i4
+       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;
+@@ -1651,6 +1653,8 @@ static struct ib_mr *i40iw_alloc_mr(stru
+       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);
+@@ -1747,7 +1751,8 @@ static int i40iw_hwreg_mr(struct i40iw_d
+ {
+       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;
+@@ -1767,6 +1772,7 @@ static int i40iw_hwreg_mr(struct i40iw_d
+       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;
+ 

diff --git a/queue-4.19/series b/queue-4.19/series
index e57520e566376601962c22e3f66752f5b8377385..518062d95aca9284ab1729fbde40afbda5561a5e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,3 +1,4 @@
+rdma-irdma-prevent-zero-length-stag-registration.patch
 drm-panel-simple-fix-innolux-g101ice-l01-timings.patch
 ata-pata_isapnp-add-missing-error-check-for-devm_iop.patch
 drm-rockchip-vop-fix-color-for-rgb888-bgr888-format-.patch