From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 59ECAA05D3 for ; Thu, 25 Apr 2019 17:41:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 471A51B5D8; Thu, 25 Apr 2019 17:41:10 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0D3231B5D4 for ; Thu, 25 Apr 2019 17:41:09 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73A94A0634; Thu, 25 Apr 2019 15:41:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 669575DC1B; Thu, 25 Apr 2019 15:41:07 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Matan Azrad , dpdk stable Date: Thu, 25 Apr 2019 16:39:53 +0100 Message-Id: <20190425154037.28778-18-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 25 Apr 2019 15:41:08 +0000 (UTC) Subject: [dpdk-stable] patch 'net/vdev_netvsc: fix device cast' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Matan Azrad --- 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@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)