From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id CEFB91B1E8; Mon, 7 Jan 2019 08:06:36 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jan 2019 23:06:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,450,1539673200"; d="scan'208";a="132174836" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 06 Jan 2019 23:06:34 -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 x0776Xt7022476; Mon, 7 Jan 2019 07:06:33 GMT Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x077619x030267; Mon, 7 Jan 2019 07:06:01 GMT Received: (from hvemulax@localhost) by wgcvswdev001.ir.intel.com with œ id x07761AB030263; Mon, 7 Jan 2019 07:06:01 GMT From: Hari Kumar Vemula To: dev@dpdk.org Cc: david.marchand@redhat.com, reshma.pattan@intel.com, ferruh.yigit@intel.com, jananeex.m.parthasarathy@intel.com, Hari kumar Vemula , stable@dpdk.org Date: Mon, 7 Jan 2019 07:05:59 +0000 Message-Id: <1546844759-29966-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 v2] 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: Mon, 07 Jan 2019 07:06:37 -0000 From: Hari kumar Vemula 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 --- lib/librte_eal/common/eal_common_options.c | 10 ++++++++-- test/test/test_eal_flags.c | 14 +++++++++++++- 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..4a900c548 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)) @@ -603,6 +605,7 @@ eal_parse_corelist(const char *corelist) max = idx; if (min == RTE_MAX_LCORE) min = idx; for (idx = min; idx <= max; idx++) { if (cfg->lcore_role[idx] != ROLE_RTE) { cfg->lcore_role[idx] = ROLE_RTE; @@ -1103,6 +1106,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 +1149,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 number, core range should be (0, %u)\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..ec79b2242 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -513,6 +513,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"}; + /* when 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" }; + /* when core number is maximum value*/ + const char * const argv28[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "999999999" }; + const char * const argv29[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "1-9999999" }; if (launch_proc(argv2) != 0) { printf("Error - " @@ -556,7 +566,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