From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 45D861B616; Fri, 11 Jan 2019 15:15:44 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2019 06:15:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,466,1539673200"; d="scan'208";a="125274849" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 11 Jan 2019 06:15:42 -0800 Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com [10.102.246.100]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x0BEFfXe004198; Fri, 11 Jan 2019 14:15:41 GMT Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x0BEF9qu013972; Fri, 11 Jan 2019 14:15:09 GMT Received: (from hvemulax@localhost) by wgcvswdev001.ir.intel.com with œ id x0BEF8vO013968; Fri, 11 Jan 2019 14:15:08 GMT From: Hari Kumar Vemula To: dev@dpdk.org Cc: david.marchand@redhat.com, ferruh.yigit@intel.com, reshma.pattan@intel.com, jananeex.m.parthasarathy@intel.com, Hari Kumar Vemula , stable@dpdk.org Date: Fri, 11 Jan 2019 14:15:06 +0000 Message-Id: <1547216106-13680-1-git-send-email-hari.kumarx.vemula@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1546518487-9942-1-git-send-email-hari.kumarx.vemula@intel.com> References: <1546518487-9942-1-git-send-email-hari.kumarx.vemula@intel.com> Subject: [dpdk-stable] [PATCH v4] eal: fix core number validation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2019 14:15:46 -0000 When incorrect core value or range provided, as part of -l command line option, a crash occurs. Added valid range checks to fix the crash. Added ut check for negative core values. Added unit test case for invalid core number range. Fixes: d888cb8b9613 ("eal: add core list input format") Cc: stable@dpdk.org Signed-off-by: Hari Kumar Vemula -- v4: Used RTE_MAX_LCORE for max core check v3: Added unit test cases for invalid core number range v2: Replace strtoul with strtol Modified log message --- lib/librte_eal/common/eal_common_options.c | 9 +++++++-- test/test/test_eal_flags.c | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 6e3a83b98..14f40c62c 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -592,7 +592,9 @@ eal_parse_corelist(const char *corelist) if (*corelist == '\0') return -1; errno = 0; - idx = strtoul(corelist, &end, 10); + idx = strtol(corelist, &end, 10); + if (idx < 0 || idx >= (int)cfg->lcore_count) + return -1; if (errno || end == NULL) return -1; while (isblank(*end)) @@ -1103,6 +1105,7 @@ eal_parse_common_option(int opt, const char *optarg, { static int b_used; static int w_used; + struct rte_config *cfg = rte_eal_get_configuration(); switch (opt) { /* blacklist */ @@ -1145,7 +1148,9 @@ eal_parse_common_option(int opt, const char *optarg, /* corelist */ case 'l': if (eal_parse_corelist(optarg) < 0) { - RTE_LOG(ERR, EAL, "invalid core list\n"); + RTE_LOG(ERR, EAL, + "invalid core list, please check core numbers are in [0, %u] range\n", + cfg->lcore_count-1); return -1; } diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c index 2acab9d69..fc45bf953 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -513,6 +514,16 @@ test_missing_c_flag(void) const char *argv25[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-1,2@(5-7),(3-5)@(0,2),(0,6),7"}; + /* core number is negative value */ + const char * const argv26[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "-5" }; + const char * const argv27[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "-5-7" }; + /* core number is maximum value */ + const char * const argv28[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "RTE_MAX_LCORE+1" }; + const char * const argv29[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "1-(RTE_MAX_LCORE+1)" }; if (launch_proc(argv2) != 0) { printf("Error - " @@ -556,7 +567,9 @@ test_missing_c_flag(void) launch_proc(argv18) == 0 || launch_proc(argv19) == 0 || launch_proc(argv20) == 0 || launch_proc(argv21) == 0 || launch_proc(argv21) == 0 || launch_proc(argv22) == 0 || - launch_proc(argv23) == 0 || launch_proc(argv24) == 0) { + launch_proc(argv23) == 0 || launch_proc(argv24) == 0 || + launch_proc(argv26) == 0 || launch_proc(argv27) == 0 || + launch_proc(argv28) == 0 || launch_proc(argv29) == 0) { printf("Error - " "process ran without error with invalid --lcore flag\n"); return -1; -- 2.17.2