patch 'vdpa/sfc: fix null dereference during removal' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Mon Feb 21 16:36:01 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

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

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

Thanks.

Kevin

---
>From 8f821b11356db2d496b09a2540e623ef6938c993 Mon Sep 17 00:00:00 2001
From: Weiguo Li <liwg06 at foxmail.com>
Date: Sun, 30 Jan 2022 01:30:12 +0800
Subject: [PATCH] vdpa/sfc: fix null dereference during removal

[ upstream commit 500640b328c2ce623715ca8ec013e7a8ff922428 ]

When sva is null, sfc_vdpa_info(sva, ...) will cause a null
dereference. Use SFC_VDPA_GENERIC_LOG() to avoid that.
See macros sfc_vdpa_info and SFC_VDPA_GENERIC_LOG
defined in drivers/vdpa/sfc/sfc_vdpa_log.h for detail.

Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver")

Signed-off-by: Weiguo Li <liwg06 at foxmail.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/vdpa/sfc/sfc_vdpa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index fccdd8c687..53f598facc 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -329,5 +329,6 @@ sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
 	sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
 	if (sva == NULL) {
-		sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+		SFC_VDPA_GENERIC_LOG(INFO,
+			"Invalid device: %s.", pci_dev->name);
 		return -1;
 	}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:48.270061424 +0000
+++ 0172-vdpa-sfc-fix-null-dereference-during-removal.patch	2022-02-21 15:22:44.334704673 +0000
@@ -1 +1 @@
-From 500640b328c2ce623715ca8ec013e7a8ff922428 Mon Sep 17 00:00:00 2001
+From 8f821b11356db2d496b09a2540e623ef6938c993 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 500640b328c2ce623715ca8ec013e7a8ff922428 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list