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 A52EB427E0;
Mon, 20 Mar 2023 10:28:21 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id E322242BFE;
Mon, 20 Mar 2023 10:28:07 +0100 (CET)
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189])
by mails.dpdk.org (Postfix) with ESMTP id C1C04427F5
for <dev@dpdk.org>; Mon, 20 Mar 2023 10:28:03 +0100 (CET)
Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.53])
by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Pg8XZ6K6Qz9vCD;
Mon, 20 Mar 2023 17:27:42 +0800 (CST)
Received: from localhost.localdomain (10.50.163.32) by
dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2507.21; Mon, 20 Mar 2023 17:28:02 +0800
From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Ciara Loftus
<ciara.loftus@intel.com>, Qi Zhang <qi.z.zhang@intel.com>, Stephen Hemminger
<stephen@networkplumber.org>, Luca Boccassi <bluca@debian.org>, Xiaolong Ye
<xiaolong.ye@intel.com>, Ferruh Yigit <ferruh.yigit@intel.com>
CC: <dev@dpdk.org>
Subject: [PATCH v2 07/44] net/af_xdp: fix segment fault when parse devargs
Date: Mon, 20 Mar 2023 09:20:33 +0000
Message-ID: <20230320092110.37295-8-fengchengwen@huawei.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20230320092110.37295-1-fengchengwen@huawei.com>
References: <20230314124813.39521-1-fengchengwen@huawei.com>
<20230320092110.37295-1-fengchengwen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.50.163.32]
X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To
dggpeml500024.china.huawei.com (7.185.36.10)
X-CFilter-Loop: Reflected
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
The rte_kvargs_process() was used to parse KV pairs, it also supports
to parse 'only keys' (e.g. socket_id) type. And the callback function
parameter 'value' is NULL when parsed 'only keys'.
This patch fixes segment fault when parse input args with 'only keys'.
Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
Fixes: 288a85aef192 ("net/af_xdp: enable custom XDP program loading")
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 2a20a6960c..519a57aeba 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -1897,6 +1897,9 @@ parse_budget_arg(const char *key __rte_unused,
int *i = (int *)extra_args;
char *end;
+ if (value == NULL)
+ return -EINVAL;
+
*i = strtol(value, &end, 10);
if (*i < 0 || *i > UINT16_MAX) {
AF_XDP_LOG(ERR, "Invalid busy_budget %i, must be >= 0 and <= %u\n",
@@ -1915,6 +1918,9 @@ parse_integer_arg(const char *key __rte_unused,
int *i = (int *)extra_args;
char *end;
+ if (value == NULL)
+ return -EINVAL;
+
*i = strtol(value, &end, 10);
if (*i < 0) {
AF_XDP_LOG(ERR, "Argument has to be positive.\n");
@@ -1931,6 +1937,9 @@ parse_name_arg(const char *key __rte_unused,
{
char *name = extra_args;
+ if (value == NULL)
+ return -EINVAL;
+
if (strnlen(value, IFNAMSIZ) > IFNAMSIZ - 1) {
AF_XDP_LOG(ERR, "Invalid name %s, should be less than %u bytes.\n",
value, IFNAMSIZ);
@@ -1949,6 +1958,9 @@ parse_prog_arg(const char *key __rte_unused,
{
char *path = extra_args;
+ if (value == NULL)
+ return -EINVAL;
+
if (strnlen(value, PATH_MAX) == PATH_MAX) {
AF_XDP_LOG(ERR, "Invalid path %s, should be less than %u bytes.\n",
value, PATH_MAX);
--
2.17.1