[dpdk-stable] patch 'net/virtio-user: fix devargs parsing' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:23:11 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/faf078d72936943caed3c99b0658c08ede859568

Thanks.

Kevin.

---
>From faf078d72936943caed3c99b0658c08ede859568 Mon Sep 17 00:00:00 2001
From: Ivan Dyukov <i.dyukov at samsung.com>
Date: Mon, 30 Mar 2020 10:58:00 +0300
Subject: [PATCH] net/virtio-user: fix devargs parsing

[ upstream commit bc5b6c11bd81ada50345db5919dc6c7850f91de1 ]

strtoull returns 0 if it fails to parse input string. It's ignored
in get_integer_arg.

This patch handles error cases for strtoull function.

Fixes: ce2eabdd43ec ("net/virtio-user: add virtual device")

Signed-off-by: Ivan Dyukov <i.dyukov at samsung.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user_ethdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 7a2de2ac1a..6c184075dd 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -389,10 +389,15 @@ get_integer_arg(const char *key __rte_unused,
 		const char *value, void *extra_args)
 {
+	uint64_t integer = 0;
 	if (!value || !extra_args)
 		return -EINVAL;
-
-	*(uint64_t *)extra_args = strtoull(value, NULL, 0);
-
-	return 0;
+	errno = 0;
+	integer = strtoull(value, NULL, 0);
+	/* extra_args keeps default value, it should be replaced
+	 * only in case of successful parsing of the 'value' arg
+	 */
+	if (errno == 0)
+		*(uint64_t *)extra_args = integer;
+	return -errno;
 }
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:03.459402707 +0100
+++ 0084-net-virtio-user-fix-devargs-parsing.patch	2020-05-28 17:12:59.174554748 +0100
@@ -1 +1 @@
-From bc5b6c11bd81ada50345db5919dc6c7850f91de1 Mon Sep 17 00:00:00 2001
+From faf078d72936943caed3c99b0658c08ede859568 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc5b6c11bd81ada50345db5919dc6c7850f91de1 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5637001dfc..741b3b0d60 100644
+index 7a2de2ac1a..6c184075dd 100644
@@ -24 +25 @@
-@@ -478,10 +478,15 @@ get_integer_arg(const char *key __rte_unused,
+@@ -389,10 +389,15 @@ get_integer_arg(const char *key __rte_unused,



More information about the stable mailing list