From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 77009A0524 for ; Thu, 4 Feb 2021 12:30:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6EA2024071E; Thu, 4 Feb 2021 12:30:13 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2049324071A for ; Thu, 4 Feb 2021 12:30:12 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cpu-00052K-5e; Thu, 04 Feb 2021 11:30:10 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Thu, 4 Feb 2021 12:27:38 +0100 Message-Id: <20210204112954.2488123-3-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/procinfo: fix check on xstats-ids' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From 34a1b3fe95b5cf95996d0313e46d62b05659162c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit 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 Reviewed-by: David Marchand --- 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@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)