[dpdk-stable] patch 'app/procinfo: fix check on xstats-ids' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 34a1b3fe95b5cf95996d0313e46d62b05659162c Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 19 Nov 2020 11:58:52 +0000
Subject: [PATCH] app/procinfo: fix check on xstats-ids

[ upstream commit 59b981c6f69cb1c705bfb93890ce8cc2a8bcdfb5 ]

'parse_xstats_ids()' return 'int'. The return value is assigned to
'nb_xstats_ids' unsigned value, later negative check on this variable is
wrong.

Adding interim 'int' variable for negative check.

Fixes: 7ac16a3660c0 ("app/proc-info: support xstats by ID and by name")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 app/proc-info/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index df932292a2..79f02e7903 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -310,14 +310,13 @@ proc_info_parse_args(int argc, char **argv)
 			} else if (!strncmp(long_option[option_index].name,
 					"xstats-ids",
 					MAX_LONG_OPT_SZ))	{
-				nb_xstats_ids = parse_xstats_ids(optarg,
+				int ret = parse_xstats_ids(optarg,
 						xstats_ids, MAX_NB_XSTATS_IDS);
-
-				if (nb_xstats_ids <= 0) {
+				if (ret <= 0) {
 					printf("xstats-id list parse error.\n");
 					return -1;
 				}
-
+				nb_xstats_ids = ret;
 			}
 			break;
 		default:
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:28.342893188 +0100
+++ 0003-app-procinfo-fix-check-on-xstats-ids.patch	2021-02-04 12:04:27.774789480 +0100
@@ -1 +1 @@
-From 59b981c6f69cb1c705bfb93890ce8cc2a8bcdfb5 Mon Sep 17 00:00:00 2001
+From 34a1b3fe95b5cf95996d0313e46d62b05659162c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 59b981c6f69cb1c705bfb93890ce8cc2a8bcdfb5 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 35e5b596eb..8ee30ddb71 100644
+index df932292a2..79f02e7903 100644
@@ -25 +26 @@
-@@ -301,14 +301,13 @@ proc_info_parse_args(int argc, char **argv)
+@@ -310,14 +310,13 @@ proc_info_parse_args(int argc, char **argv)