patch 'net/ice/base: fix bit finding range over ptype bitmap' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/01/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/f1ac3e709008a36b806ca04e83d95dbd70134632

Thanks.

Kevin

---
>From f1ac3e709008a36b806ca04e83d95dbd70134632 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Mon, 15 Aug 2022 03:31:26 -0400
Subject: [PATCH] net/ice/base: fix bit finding range over ptype bitmap

[ upstream commit ac549a3249172cbef3417cf53e6ff35f0ca1de65 ]

The 2nd argument to function ice_find_first_bit is the bitmap size,
(in bits) not a mask. Thus, use of UINT16_MAX or 0xFFFF will allow a
potential run off the end of the ptype array.
Also, the ptype bitmap (i.e., prof->ptypes) is declared with size
ICE_FLOW_PTYPE_MAX, thus finding the bits within this bitmap should
not exceed this bound.

Fixes: 8ebb93942b2c ("net/ice/base: add function to set HW profile for raw flow")

Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/base/ice_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 0db474bd62..554e9bc8ef 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -2547,5 +2547,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle,
 		     enum ice_block blk)
 {
-	int id = ice_find_first_bit(prof->ptypes, UINT16_MAX);
+	int id = ice_find_first_bit(prof->ptypes, ICE_FLOW_PTYPE_MAX);
 	struct ice_flow_prof_params *params;
 	u8 fv_words = hw->blk[blk].es.fvw;
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:59.806264467 +0100
+++ 0056-net-ice-base-fix-bit-finding-range-over-ptype-bitmap.patch	2022-10-25 14:18:58.436798181 +0100
@@ -1 +1 @@
-From ac549a3249172cbef3417cf53e6ff35f0ca1de65 Mon Sep 17 00:00:00 2001
+From f1ac3e709008a36b806ca04e83d95dbd70134632 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac549a3249172cbef3417cf53e6ff35f0ca1de65 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 54181044f1..b196e51276 100644
+index 0db474bd62..554e9bc8ef 100644
@@ -27 +28 @@
-@@ -2562,5 +2562,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle,
+@@ -2547,5 +2547,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle,