The addition of the bus_info field did not account for the fact that the
PCI bus can be scanned multiple times (like for device hotplug and other
uses in SPDK).
Indeed, during pci_scan_one() for devices that were already registered,
the pci_common_set() overwrites the bus_info field, leaking the
previously allocated memory.

Since the bus_info content is fixed for a PCI device, we can simply skip
allocation if dev->bus_info is already set.

Fixes: 8f4de2dba9b9 ("bus/pci: fill bus specific information")

Reported-by: Tomasz Zawadzki <tomasz.zawad...@intel.com>
Signed-off-by: David Marchand <david.march...@redhat.com>
---
 drivers/bus/pci/pci_common.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 9901c34f4e..bc3a7f39fe 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -114,8 +114,9 @@ pci_common_set(struct rte_pci_device *dev)
                /* Otherwise, it uses the internal, canonical form. */
                dev->device.name = dev->name;
 
-       if (asprintf(&dev->bus_info, "vendor_id=%"PRIx16", device_id=%"PRIx16,
-                       dev->id.vendor_id, dev->id.device_id) != -1)
+       if (dev->bus_info != NULL ||
+                       asprintf(&dev->bus_info, "vendor_id=%"PRIx16", 
device_id=%"PRIx16,
+                               dev->id.vendor_id, dev->id.device_id) != -1)
                dev->device.bus_info = dev->bus_info;
 }
 
-- 
2.38.1

Reply via email to