[dpdk-stable] patch 'net/ice: fix crash in switch filter' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/20. 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.

Thanks.

Luca Boccassi

---
>From 82e2269d013d7bd8af27f0982ab4a279b6edd020 Mon Sep 17 00:00:00 2001
From: Junyu Jiang <junyux.jiang at intel.com>
Date: Wed, 6 May 2020 03:05:25 +0000
Subject: [PATCH] net/ice: fix crash in switch filter

[ upstream commit 1f8672be4208e897e0d1004f43dadcac80749f68 ]

The number of queues in queue group should be checked before
using it. This patch fixed the issue.

Fixes: 47d460d63233 ("net/ice: rework switch filter")

Signed-off-by: Junyu Jiang <junyux.jiang at intel.com>
Tested-by: Qimai Xiao <qimaix.xiao at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/ice_switch_filter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 1d91d773ec..202f29dab5 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -937,6 +937,8 @@ ice_switch_parse_action(struct ice_pf *pf,
 		switch (action_type) {
 		case RTE_FLOW_ACTION_TYPE_RSS:
 			act_qgrop = action->conf;
+			if (act_qgrop->queue_num <= 1)
+				goto error;
 			rule_info->sw_act.fltr_act =
 				ICE_FWD_TO_QGRP;
 			rule_info->sw_act.fwd_id.q_id =
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:52.356196987 +0100
+++ 0191-net-ice-fix-crash-in-switch-filter.patch	2020-05-19 14:04:44.544654318 +0100
@@ -1,13 +1,14 @@
-From 1f8672be4208e897e0d1004f43dadcac80749f68 Mon Sep 17 00:00:00 2001
+From 82e2269d013d7bd8af27f0982ab4a279b6edd020 Mon Sep 17 00:00:00 2001
 From: Junyu Jiang <junyux.jiang at intel.com>
 Date: Wed, 6 May 2020 03:05:25 +0000
 Subject: [PATCH] net/ice: fix crash in switch filter
 
+[ upstream commit 1f8672be4208e897e0d1004f43dadcac80749f68 ]
+
 The number of queues in queue group should be checked before
 using it. This patch fixed the issue.
 
 Fixes: 47d460d63233 ("net/ice: rework switch filter")
-Cc: stable at dpdk.org
 
 Signed-off-by: Junyu Jiang <junyux.jiang at intel.com>
 Tested-by: Qimai Xiao <qimaix.xiao at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
-index 72bb22395b..1bea7e807c 100644
+index 1d91d773ec..202f29dab5 100644
 --- a/drivers/net/ice/ice_switch_filter.c
 +++ b/drivers/net/ice/ice_switch_filter.c
-@@ -1297,6 +1297,8 @@ ice_switch_parse_action(struct ice_pf *pf,
+@@ -937,6 +937,8 @@ ice_switch_parse_action(struct ice_pf *pf,
  		switch (action_type) {
  		case RTE_FLOW_ACTION_TYPE_RSS:
  			act_qgrop = action->conf;