From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 5842B2C36 for ; Thu, 17 Jan 2019 11:12:04 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2019 02:12:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="119212080" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 17 Jan 2019 02:12:01 -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 x0HAC1Ts014729; Thu, 17 Jan 2019 10:12:01 GMT Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x0HABRFl003362; Thu, 17 Jan 2019 10:11:27 GMT Received: (from hvemulax@localhost) by wgcvswdev001.ir.intel.com with œ id x0HABRmS003357; Thu, 17 Jan 2019 10:11:27 GMT From: Hari Kumar Vemula To: reshma.pattan@intel.com Cc: jananeex.m.parthasarathy@intel.com, Hari Kumar Vemula , stable@dpdk.org Date: Thu, 17 Jan 2019 10:11:23 +0000 Message-Id: <1547719883-3000-1-git-send-email-hari.kumarx.vemula@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1547216106-13680-1-git-send-email-hari.kumarx.vemula@intel.com> References: <1547216106-13680-1-git-send-email-hari.kumarx.vemula@intel.com> Subject: [dpdk-stable] [PATCH v6] 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: Thu, 17 Jan 2019 10:12:05 -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 Reviewed-by: David Marchand -- v6: Changed testcase order and added reviewed-by tag v5: Corrected unit test case for -l option 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 | 57 ++++++++++++++-------- 2 files changed, 43 insertions(+), 23 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..24ca5b6a0 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -480,37 +481,47 @@ test_missing_c_flag(void) /* sanity check test - valid corelist value */ const char *argv11[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1-2,3" }; + /* core number is negative value */ + const char * const argv12[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "-5" }; + const char * const argv13[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "-5-7" }; + /* core number is maximum value */ + const char * const argv14[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", RTE_STR(RTE_MAX_LCORE) }; + const char * const argv15[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1-"RTE_STR(RTE_MAX_LCORE) }; /* --lcores flag but no lcores value */ - const char *argv12[] = { prgname, prefix, mp_flag, + const char * const argv16[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores" }; - const char *argv13[] = { prgname, prefix, mp_flag, + const char * const argv17[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", " " }; /* bad lcores value */ - const char *argv14[] = { prgname, prefix, mp_flag, + const char * const argv18[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "1-3-5" }; - const char *argv15[] = { prgname, prefix, mp_flag, + const char * const argv19[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-1,,2" }; - const char *argv16[] = { prgname, prefix, mp_flag, + const char * const argv20[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-,1" }; - const char *argv17[] = { prgname, prefix, mp_flag, + const char * const argv21[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(0-,2-4)" }; - const char *argv18[] = { prgname, prefix, mp_flag, + const char * const argv22[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(-1,2)" }; - const char *argv19[] = { prgname, prefix, mp_flag, + const char * const argv23[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(2-4)@(2-4-6)" }; - const char *argv20[] = { prgname, prefix, mp_flag, + const char * const argv24[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(a,2)" }; - const char *argv21[] = { prgname, prefix, mp_flag, + const char * const argv25[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "1-3@(1,3)" }; - const char *argv22[] = { prgname, prefix, mp_flag, + const char * const argv26[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "3@((1,3)" }; - const char *argv23[] = { prgname, prefix, mp_flag, + const char * const argv27[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(4-7)=(1,3)" }; - const char *argv24[] = { prgname, prefix, mp_flag, + const char * const argv28[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "[4-7]@(1,3)" }; /* sanity check of tests - valid lcores value */ - const char *argv25[] = { prgname, prefix, mp_flag, + const char * const argv29[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-1,2@(5-7),(3-5)@(0,2),(0,6),7"}; @@ -538,7 +549,11 @@ test_missing_c_flag(void) || launch_proc(argv7) == 0 || launch_proc(argv8) == 0 || launch_proc(argv9) == 0 - || launch_proc(argv10) == 0) { + || launch_proc(argv10) == 0 + || launch_proc(argv12) == 0 + || launch_proc(argv13) == 0 + || launch_proc(argv14) == 0 + || launch_proc(argv15) == 0) { printf("Error - " "process ran without error with invalid -l flag\n"); return -1; @@ -550,19 +565,19 @@ test_missing_c_flag(void) } /* start --lcores tests */ - if (launch_proc(argv12) == 0 || launch_proc(argv13) == 0 || - launch_proc(argv14) == 0 || launch_proc(argv15) == 0 || - launch_proc(argv16) == 0 || launch_proc(argv17) == 0 || + if (launch_proc(argv16) == 0 || launch_proc(argv17) == 0 || 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(argv22) == 0 || launch_proc(argv23) == 0 || + launch_proc(argv24) == 0 || launch_proc(argv25) == 0 || + launch_proc(argv26) == 0 || launch_proc(argv27) == 0 || + launch_proc(argv28) == 0) { printf("Error - " "process ran without error with invalid --lcore flag\n"); return -1; } - if (launch_proc(argv25) != 0) { + if (launch_proc(argv29) != 0) { printf("Error - " "process did not run ok with valid corelist value\n"); return -1; -- 2.17.2