[dpdk-stable] patch 'net/vdev_netvsc: fix device cast' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Thu Apr 25 17:39:53 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/01/19. 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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From d540cf8d8cae4a4b37ec285f59f122d2492eae78 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 12 Mar 2019 19:12:53 -0700
Subject: [PATCH] net/vdev_netvsc: fix device cast

[ upstream commit cc7cd517b1a26f284112a5d6e5f40d6c63584930 ]

The return value from bus->find_device is a rte_device
which is not safe to cast to a rte_vdev_device structure.
It doesn't really matter since only being checked for NULL
but static checkers might find a bug here.

Fixes: 56252de779a6 ("net/vdev_netvsc: add automatic probing")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/vdev_netvsc/vdev_netvsc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index 16303ef5e..a5fd64e0c 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -812,5 +812,5 @@ static void
 vdev_netvsc_scan_callback(__rte_unused void *arg)
 {
-	struct rte_vdev_device *dev;
+	struct rte_device *dev;
 	struct rte_devargs *devargs;
 	struct rte_bus *vbus = rte_bus_find_by_name("vdev");
@@ -820,6 +820,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)
 			     VDEV_NETVSC_DRIVER_NAME_LEN))
 			return;
-	dev = (struct rte_vdev_device *)vbus->find_device(NULL,
-		vdev_netvsc_cmp_rte_device, VDEV_NETVSC_DRIVER_NAME);
+
+	dev = vbus->find_device(NULL, vdev_netvsc_cmp_rte_device,
+				VDEV_NETVSC_DRIVER_NAME);
 	if (dev)
 		return;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.536807149 +0100
+++ 0018-net-vdev_netvsc-fix-device-cast.patch	2019-04-25 16:37:46.701295956 +0100
@@ -1 +1 @@
-From cc7cd517b1a26f284112a5d6e5f40d6c63584930 Mon Sep 17 00:00:00 2001
+From d540cf8d8cae4a4b37ec285f59f122d2492eae78 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc7cd517b1a26f284112a5d6e5f40d6c63584930 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index ba63fac2a..801f54c96 100644
+index 16303ef5e..a5fd64e0c 100644
@@ -24 +25 @@
-@@ -809,5 +809,5 @@ static void
+@@ -812,5 +812,5 @@ static void
@@ -31 +32 @@
-@@ -817,6 +817,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)
+@@ -820,6 +820,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)


More information about the stable mailing list