[dpdk-stable] patch 'pipeline: fix instruction label check' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/073e6a7c0094bc6d706fb1890343b4fb20f30cf9

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 073e6a7c0094bc6d706fb1890343b4fb20f30cf9 Mon Sep 17 00:00:00 2001
From: Yogesh Jangra <yogesh.jangra at intel.com>
Date: Wed, 20 Oct 2021 23:23:32 -0400
Subject: [PATCH] pipeline: fix instruction label check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 55095ccb7fdda113186e3191760a5cf0b0e8d28d ]

The instruction_data array was incorrectly indexed, which resulted in
the array index getting out of bounds and sometimes segfault.

Fixes: a1711f (“pipeline: add SWX Rx and extract instructions“)

Signed-off-by: Yogesh Jangra <yogesh.jangra at intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 lib/librte_pipeline/rte_swx_pipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c
index e4fbf1b1be..4a96b77e28 100644
--- a/lib/librte_pipeline/rte_swx_pipeline.c
+++ b/lib/librte_pipeline/rte_swx_pipeline.c
@@ -5915,7 +5915,7 @@ instr_label_check(struct instruction_data *instruction_data,
 			continue;
 
 		for (j = i + 1; j < n_instructions; j++)
-			CHECK(strcmp(label, data[j].label), EINVAL);
+			CHECK(strcmp(label, instruction_data[j].label), EINVAL);
 	}
 
 	/* Get users for each instruction label. */
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:10.177275009 +0800
+++ 0186-pipeline-fix-instruction-label-check.patch	2021-11-10 14:17:01.997411721 +0800
@@ -1 +1 @@
-From 55095ccb7fdda113186e3191760a5cf0b0e8d28d Mon Sep 17 00:00:00 2001
+From 073e6a7c0094bc6d706fb1890343b4fb20f30cf9 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 55095ccb7fdda113186e3191760a5cf0b0e8d28d ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
- lib/pipeline/rte_swx_pipeline.c | 2 +-
+ lib/librte_pipeline/rte_swx_pipeline.c | 2 +-
@@ -21,5 +23,5 @@
-diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
-index 1cd09a4b44..055056098d 100644
---- a/lib/pipeline/rte_swx_pipeline.c
-+++ b/lib/pipeline/rte_swx_pipeline.c
-@@ -5983,7 +5983,7 @@ instr_label_check(struct instruction_data *instruction_data,
+diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c
+index e4fbf1b1be..4a96b77e28 100644
+--- a/lib/librte_pipeline/rte_swx_pipeline.c
++++ b/lib/librte_pipeline/rte_swx_pipeline.c
+@@ -5915,7 +5915,7 @@ instr_label_check(struct instruction_data *instruction_data,