From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8C12645C0B;
Tue, 29 Oct 2024 14:39:13 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 356F642E6A;
Tue, 29 Oct 2024 14:39:02 +0100 (CET)
Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191])
by mails.dpdk.org (Postfix) with ESMTP id 2D5DA42E5F
for <dev@dpdk.org>; Tue, 29 Oct 2024 14:38:58 +0100 (CET)
Received: from mail.maildlp.com (unknown [172.19.162.112])
by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4XdBBs17Myz1jw74;
Tue, 29 Oct 2024 21:37:25 +0800 (CST)
Received: from kwepemm600004.china.huawei.com (unknown [7.193.23.242])
by mail.maildlp.com (Postfix) with ESMTPS id EDA0414013B;
Tue, 29 Oct 2024 21:38:55 +0800 (CST)
Received: from localhost.localdomain (10.28.79.22) by
kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.1.2507.39; Tue, 29 Oct 2024 21:38:55 +0800
From: Huisong Li <lihuisong@huawei.com>
To: <dev@dpdk.org>
CC: <mb@smartsharesystems.com>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
<anatoly.burakov@intel.com>, <david.hunt@intel.com>,
<sivaprasad.tummala@amd.com>, <stephen@networkplumber.org>,
<konstantin.ananyev@huawei.com>, <david.marchand@redhat.com>,
<fengchengwen@huawei.com>, <liuyonglong@huawei.com>, <lihuisong@huawei.com>
Subject: [PATCH v14 2/3] examples/l3fwd-power: fix data overflow when parse
command line
Date: Tue, 29 Oct 2024 21:28:03 +0800
Message-ID: <20241029132804.27613-3-lihuisong@huawei.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20241029132804.27613-1-lihuisong@huawei.com>
References: <20240320105529.5626-1-lihuisong@huawei.com>
<20241029132804.27613-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: dggems706-chm.china.huawei.com (10.3.19.183) To
kwepemm600004.china.huawei.com (7.193.23.242)
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <lihuisong@huawei.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
---
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 2bb6b092c3..96fac45c61 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1524,8 +1524,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;
@@ -1535,23 +1539,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
@@ -1898,8 +1894,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,
@@ -1912,29 +1909,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