Acked-by: Liron Himi <lir...@marvell.com>
-----Original Message-----
From: Chengwen Feng <fengcheng...@huawei.com>
Sent: Monday, 20 March 2023 11:21
To: tho...@monjalon.net; ferruh.yi...@amd.com; Liron Himi <lir...@marvell.com>;
Tomasz Duszynski <tduszyn...@marvell.com>; Jacek Siuda <j...@semihalf.com>
Cc: dev@dpdk.org
Subject: [EXT] [PATCH v2 23/44] net/mvpp2: fix segment fault when parse devargs
External Email
----------------------------------------------------------------------
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: 0ddc9b815b11 ("net/mrvl: add net PMD skeleton")
Fixes: c2b5ae61c07e ("net/mvpp2: support DSA mode")
Cc: sta...@dpdk.org
Signed-off-by: Chengwen Feng <fengcheng...@huawei.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 3 +++
drivers/net/mvpp2/mrvl_qos.c | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 89c83f1c1f..a631d6d9cc 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -3180,6 +3180,9 @@ mrvl_get_ifnames(const char *key __rte_unused, const char
*value, {
struct mrvl_ifnames *ifnames = extra_args;
+ if (value == NULL)
+ return -EINVAL;
+
ifnames->names[ifnames->idx++] = value;
return 0;
diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c index
f43217bc58..f217a8d71a 100644
--- a/drivers/net/mvpp2/mrvl_qos.c
+++ b/drivers/net/mvpp2/mrvl_qos.c
@@ -656,12 +656,16 @@ int
mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
{
struct mrvl_cfg **cfg = extra_args;
- struct rte_cfgfile *file = rte_cfgfile_load(path, 0);
+ struct rte_cfgfile *file;
uint32_t val;
int n, i, ret;
const char *entry;
char sec_name[32];
+ if (path == NULL)
+ return -EINVAL;
+
+ file = rte_cfgfile_load(path, 0);
if (file == NULL) {
MRVL_LOG(ERR, "Cannot load configuration %s\n", path);
return -1;
--
2.17.1
