patch 'app/pdump: abort on multi-core capture limit' has been queued to stable release 19.11.12

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.12

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/11/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/e980bd3f16782be650fa286adedefc3644bc35e4

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From e980bd3f16782be650fa286adedefc3644bc35e4 Mon Sep 17 00:00:00 2001
From: Reshma Pattan <reshma.pattan at intel.com>
Date: Mon, 28 Feb 2022 09:58:56 +0000
Subject: [PATCH] app/pdump: abort on multi-core capture limit

[ upstream commit 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c ]

Check lcore id value is not the maximum core supported.
Using lcore id without this check might cause
out of bound access inside the rte_eal_wait_lcore.

Coverity issue: 375841
Fixes: b2854d5317e8 ("app/pdump: support multi-core capture")

Signed-off-by: Reshma Pattan <reshma.pattan at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 app/pdump/main.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/pdump/main.c b/app/pdump/main.c
index c38c53719e..99ef010d13 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -906,11 +906,21 @@ dump_packets_core(void *arg)
 	return 0;
 }
 
+static unsigned int
+get_next_core(unsigned int lcore)
+{
+	lcore = rte_get_next_lcore(lcore, 1, 0);
+	if (lcore == RTE_MAX_LCORE)
+		rte_exit(EXIT_FAILURE,
+				"Max core limit %u reached for packet capture", lcore);
+	return lcore;
+}
+
 static inline void
 dump_packets(void)
 {
 	int i;
-	uint32_t lcore_id = 0;
+	unsigned int lcore_id = 0;
 
 	if (!multiple_core_capture) {
 		printf(" core (%u), capture for (%d) tuples\n",
@@ -936,12 +946,12 @@ dump_packets(void)
 		return;
 	}
 
-	lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
+	lcore_id = get_next_core(lcore_id);
 
 	for (i = 0; i < num_tuples; i++) {
 		rte_eal_remote_launch(dump_packets_core,
 				&pdump_t[i], lcore_id);
-		lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
+		lcore_id = get_next_core(lcore_id);
 
 		if (rte_eal_wait_lcore(lcore_id) < 0)
 			rte_exit(EXIT_FAILURE, "failed to wait\n");
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-09 11:57:45.514214973 +0100
+++ 0041-app-pdump-abort-on-multi-core-capture-limit.patch	2022-03-09 11:57:43.420938557 +0100
@@ -1 +1 @@
-From 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c Mon Sep 17 00:00:00 2001
+From e980bd3f16782be650fa286adedefc3644bc35e4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 04a38e8911..96fa76f8da 100644
+index c38c53719e..99ef010d13 100644
@@ -24 +25 @@
-@@ -900,11 +900,21 @@ dump_packets_core(void *arg)
+@@ -906,11 +906,21 @@ dump_packets_core(void *arg)
@@ -47 +48 @@
-@@ -930,12 +940,12 @@ dump_packets(void)
+@@ -936,12 +946,12 @@ dump_packets(void)