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 3B8C645C21; Mon, 11 Nov 2024 10:26:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AE87410D0; Mon, 11 Nov 2024 10:25:57 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id ACDDF40EE2 for ; Mon, 11 Nov 2024 10:25:48 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Xn3xg31LNz10Qt5; Mon, 11 Nov 2024 17:23:19 +0800 (CST) Received: from dggemv704-chm.china.huawei.com (unknown [10.3.19.47]) by mail.maildlp.com (Postfix) with ESMTPS id 24713140134; Mon, 11 Nov 2024 17:25:46 +0800 (CST) Received: from kwepemn100009.china.huawei.com (7.202.194.112) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 11 Nov 2024 17:25:42 +0800 Received: from localhost.localdomain (10.28.79.22) by kwepemn100009.china.huawei.com (7.202.194.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 11 Nov 2024 17:25:42 +0800 From: Huisong Li To: CC: , , , , , , , , , , , Subject: [RESEND PATCH v15 2/3] examples/l3fwd-power: fix data overflow when parse command line Date: Mon, 11 Nov 2024 17:14:37 +0800 Message-ID: <20241111091438.28659-3-lihuisong@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20241111091438.28659-1-lihuisong@huawei.com> References: <20240320105529.5626-1-lihuisong@huawei.com> <20241111091438.28659-1-lihuisong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemn100009.china.huawei.com (7.202.194.112) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Many variables are 'uint32_t', like, 'pause_duration', 'scale_freq_min' and so on. They use parse_int() to parse it from command line. But overflow problem occurs when this function return. Fixes: 59f2853c4cae ("examples/l3fwd_power: add configuration options") Cc: stable@dpdk.org Signed-off-by: Huisong Li Acked-by: Konstantin Ananyev Acked-by: Chengwen Feng Acked-by: Sivaprasad Tummala --- examples/l3fwd-power/main.c | 41 +++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 272e069207..7bc524aa16 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1520,8 +1520,12 @@ print_usage(const char *prgname) prgname); } +/* + * Caller must give the right upper limit so as to ensure receiver variable + * doesn't overflow. + */ static int -parse_int(const char *opt) +parse_uint(const char *opt, uint32_t max, uint32_t *res) { char *end = NULL; unsigned long val; @@ -1531,23 +1535,15 @@ parse_int(const char *opt) if ((opt[0] == '\0') || (end == NULL) || (*end != '\0')) return -1; - return val; -} - -static int parse_max_pkt_len(const char *pktlen) -{ - char *end = NULL; - unsigned long len; - - /* parse decimal string */ - len = strtoul(pktlen, &end, 10); - if ((pktlen[0] == '\0') || (end == NULL) || (*end != '\0')) + if (val > max) { + RTE_LOG(ERR, L3FWD_POWER, "%s parameter shouldn't exceed %u.\n", + opt, max); return -1; + } - if (len == 0) - return -1; + *res = val; - return len; + return 0; } static int @@ -1894,8 +1890,9 @@ parse_args(int argc, char **argv) if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_MAX_PKT_LEN, sizeof(CMD_LINE_OPT_MAX_PKT_LEN))) { + if (parse_uint(optarg, UINT32_MAX, &max_pkt_len) != 0) + return -1; printf("Custom frame size is configured\n"); - max_pkt_len = parse_max_pkt_len(optarg); } if (!strncmp(lgopts[option_index].name, @@ -1908,29 +1905,33 @@ parse_args(int argc, char **argv) if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_MAX_EMPTY_POLLS, sizeof(CMD_LINE_OPT_MAX_EMPTY_POLLS))) { + if (parse_uint(optarg, UINT32_MAX, &max_empty_polls) != 0) + return -1; printf("Maximum empty polls configured\n"); - max_empty_polls = parse_int(optarg); } if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_PAUSE_DURATION, sizeof(CMD_LINE_OPT_PAUSE_DURATION))) { + if (parse_uint(optarg, UINT32_MAX, &pause_duration) != 0) + return -1; printf("Pause duration configured\n"); - pause_duration = parse_int(optarg); } if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_SCALE_FREQ_MIN, sizeof(CMD_LINE_OPT_SCALE_FREQ_MIN))) { + if (parse_uint(optarg, UINT32_MAX, &scale_freq_min) != 0) + return -1; printf("Scaling frequency minimum configured\n"); - scale_freq_min = parse_int(optarg); } if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_SCALE_FREQ_MAX, sizeof(CMD_LINE_OPT_SCALE_FREQ_MAX))) { + if (parse_uint(optarg, UINT32_MAX, &scale_freq_max) != 0) + return -1; printf("Scaling frequency maximum configured\n"); - scale_freq_max = parse_int(optarg); } break; -- 2.22.0