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 7C5A0A0A02 for ; Mon, 17 May 2021 18:21:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74C9C40041; Mon, 17 May 2021 18:21:59 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 1673040F35 for ; Mon, 17 May 2021 18:21:56 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lig09-0000R5-UG; Mon, 17 May 2021 16:21:54 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Harry van Haaren , dpdk stable Date: Mon, 17 May 2021 18:21:17 +0200 Message-Id: <20210517162125.3178901-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix service core list parsing' has been queued to stable release 19.11.9 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.9 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/19/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/a6a7ec2b229ae7d0e7a9112a00afc35f53ad773d Thanks. Christian Ehrhardt --- >From a6a7ec2b229ae7d0e7a9112a00afc35f53ad773d Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 5 May 2021 12:10:07 +0800 Subject: [PATCH] eal: fix service core list parsing [ upstream commit 97ca1e786b25182199877393978decbed6608a78 ] This patch adds checking for service core index validity when parsing service corelist. Fixes: 7dbd7a6413ef ("service: add -S corelist option") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Harry van Haaren --- lib/librte_eal/common/eal_common_options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index f791e9671d..7dd4d90cf7 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -499,10 +499,10 @@ static int eal_parse_service_corelist(const char *corelist) { struct rte_config *cfg = rte_eal_get_configuration(); - int i, idx = 0; + int i; unsigned count = 0; char *end = NULL; - int min, max; + uint32_t min, max, idx; uint32_t taken_lcore_count = 0; if (corelist == NULL) @@ -526,6 +526,8 @@ eal_parse_service_corelist(const char *corelist) idx = strtoul(corelist, &end, 10); if (errno || end == NULL) return -1; + if (idx >= RTE_MAX_LCORE) + return -1; while (isblank(*end)) end++; if (*end == '-') { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:37.269540237 +0200 +++ 0202-eal-fix-service-core-list-parsing.patch 2021-05-17 17:40:29.579812690 +0200 @@ -1 +1 @@ -From 97ca1e786b25182199877393978decbed6608a78 Mon Sep 17 00:00:00 2001 +From a6a7ec2b229ae7d0e7a9112a00afc35f53ad773d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 97ca1e786b25182199877393978decbed6608a78 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eal/common/eal_common_options.c | 6 ++++-- + lib/librte_eal/common/eal_common_options.c | 6 ++++-- @@ -19,5 +20,5 @@ -diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c -index 66f9114715..97ab6e00fd 100644 ---- a/lib/eal/common/eal_common_options.c -+++ b/lib/eal/common/eal_common_options.c -@@ -758,10 +758,10 @@ static int +diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c +index f791e9671d..7dd4d90cf7 100644 +--- a/lib/librte_eal/common/eal_common_options.c ++++ b/lib/librte_eal/common/eal_common_options.c +@@ -499,10 +499,10 @@ static int @@ -36 +37 @@ -@@ -785,6 +785,8 @@ eal_parse_service_corelist(const char *corelist) +@@ -526,6 +526,8 @@ eal_parse_service_corelist(const char *corelist)