patch 'ethdev: fix potential leak in PCI probing helper' has been queued to stable release 20.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 07/16/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/a981ef39159d96f6e9d72ea5986265b992bbfd74

Thanks.

Luca Boccassi

---
>From a981ef39159d96f6e9d72ea5986265b992bbfd74 Mon Sep 17 00:00:00 2001
From: Kaiyu Zhang <squirrel.prog at gmail.com>
Date: Tue, 11 Jul 2023 01:18:09 +0000
Subject: [PATCH] ethdev: fix potential leak in PCI probing helper

[ upstream commit 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 ]

Sanity check is performed after a rte_eth_dev object is allocated.

The object is not freed if the check fails, though in the current
reality this never happens, but it's better programming paradigm
to move the quick check up front to the start of
rte_eth_dev_pci_generic_probe().

Fixes: dcd5c8112bc3 ("ethdev: add PCI driver helpers")

Signed-off-by: Kaiyu Zhang <squirrel.prog at gmail.com>
Reviewed-by: Chengwen Feng <fengchengwen at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 lib/librte_ethdev/rte_ethdev_pci.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index d015697e21..d5ec47f283 100644
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -126,6 +126,9 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev,
 	struct rte_eth_dev *eth_dev;
 	int ret;
 
+	if (*dev_init == NULL)
+		return -EINVAL;
+
 	eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size);
 	if (!eth_dev)
 		return -ENOMEM;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-14 23:33:08.828659111 +0100
+++ 0008-ethdev-fix-potential-leak-in-PCI-probing-helper.patch	2023-07-14 23:33:08.487305115 +0100
@@ -1 +1 @@
-From 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 Mon Sep 17 00:00:00 2001
+From a981ef39159d96f6e9d72ea5986265b992bbfd74 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -20,21 +21,8 @@
- .mailmap                | 1 +
- lib/ethdev/ethdev_pci.h | 9 +++++----
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/.mailmap b/.mailmap
-index d200f36339..6c28ea798d 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -698,6 +698,7 @@ Kai Ji <kai.ji at intel.com>
- Kaijun Zeng <corezeng at gmail.com>
- Kaisen You <kaisenx.you at intel.com>
- Kaiwen Deng <kaiwenx.deng at intel.com>
-+Kaiyu Zhang <squirrel.prog at gmail.com>
- Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
- Kamalakannan R <kamalakannan.r at intel.com>
- Kamalakshitha Aligeri <kamalakshitha.aligeri at arm.com>
-diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
-index 94b8fba5d7..320e3e0093 100644
---- a/lib/ethdev/ethdev_pci.h
-+++ b/lib/ethdev/ethdev_pci.h
-@@ -126,12 +126,13 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev,
+ lib/librte_ethdev/rte_ethdev_pci.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
+index d015697e21..d5ec47f283 100644
+--- a/lib/librte_ethdev/rte_ethdev_pci.h
++++ b/lib/librte_ethdev/rte_ethdev_pci.h
+@@ -126,6 +126,9 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev,
@@ -44,10 +32,2 @@
--	eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size);
--	if (!eth_dev)
--		return -ENOMEM;
--
- 	if (*dev_init == NULL)
- 		return -EINVAL;
-+
-+	eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size);
-+	if (!eth_dev)
-+		return -ENOMEM;
++	if (*dev_init == NULL)
++		return -EINVAL;
@@ -55,3 +35,3 @@
- 	ret = dev_init(eth_dev);
- 	if (ret)
- 		rte_eth_dev_release_port(eth_dev);
+ 	eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size);
+ 	if (!eth_dev)
+ 		return -ENOMEM;