patch 'net/virtio: fix empty devargs parsing' has been queued to stable release 20.11.8
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Mar 15 23:46:10 CET 2023
Hi,
FYI, your patch has been queued to stable release 20.11.8
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/17/23. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/279024fc7c8b73769f52ae0735cd2db24714aef3
Thanks.
Luca Boccassi
---
>From 279024fc7c8b73769f52ae0735cd2db24714aef3 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Thu, 2 Mar 2023 07:50:10 +0000
Subject: [PATCH] net/virtio: fix empty devargs parsing
[ upstream commit 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 ]
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'
(e.g. vectorized,vdpa).
Fixes: 4710e16a4a7b ("net/virtio: add parameter to enable vectorized path")
Fixes: 44d7b2e87b69 ("net/virtio: refactor devargs parsing")
Fixes: 440f03c25378 ("net/virtio: skip device probe in vDPA mode")
Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
drivers/net/virtio/virtio_ethdev.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ce612f7400..011130c61f 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -2097,6 +2097,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
static int vdpa_check_handler(__rte_unused const char *key,
const char *value, void *ret_val)
{
+ if (value == NULL || ret_val == NULL)
+ return -EINVAL;
+
if (strcmp(value, "1") == 0)
*(int *)ret_val = 1;
else
@@ -2134,6 +2137,9 @@ virtio_dev_speed_capa_get(uint32_t speed)
static int vectorized_check_handler(__rte_unused const char *key,
const char *value, void *ret_val)
{
+ if (value == NULL || ret_val == NULL)
+ return -EINVAL;
+
if (strcmp(value, "1") == 0)
*(int *)ret_val = 1;
else
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-03-15 22:44:50.713282199 +0000
+++ 0019-net-virtio-fix-empty-devargs-parsing.patch 2023-03-15 22:44:49.575850093 +0000
@@ -1 +1 @@
-From 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 Mon Sep 17 00:00:00 2001
+From 279024fc7c8b73769f52ae0735cd2db24714aef3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21,3 +22,2 @@
- drivers/net/virtio/virtio_ethdev.c | 3 +++
- drivers/net/virtio/virtio_pci_ethdev.c | 3 +++
- 2 files changed, 6 insertions(+)
+ drivers/net/virtio/virtio_ethdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
@@ -26 +26 @@
-index dc6856d749..ae84d313be 100644
+index ce612f7400..011130c61f 100644
@@ -29,2 +29,2 @@
-@@ -2056,6 +2056,9 @@ virtio_dev_speed_capa_get(uint32_t speed)
- static int vectorized_check_handler(__rte_unused const char *key,
+@@ -2097,6 +2097,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
+ static int vdpa_check_handler(__rte_unused const char *key,
@@ -39,6 +39,2 @@
-diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c
-index abc63b0935..9b4b846f8a 100644
---- a/drivers/net/virtio/virtio_pci_ethdev.c
-+++ b/drivers/net/virtio/virtio_pci_ethdev.c
-@@ -148,6 +148,9 @@ eth_virtio_pci_uninit(struct rte_eth_dev *eth_dev)
- static int vdpa_check_handler(__rte_unused const char *key,
+@@ -2134,6 +2137,9 @@ virtio_dev_speed_capa_get(uint32_t speed)
+ static int vectorized_check_handler(__rte_unused const char *key,
More information about the stable
mailing list