diff mbox series

[1/6] bus/pci: fix a segfault when call callback

Message ID	20220825025719.14281-2-lihuisong@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Andrew Rybchenko
Headers	From: Huisong Li <lihuisong@huawei.com> To: <dev@dpdk.org> CC: <thomas@monjalon.net>, <ferruh.yigit@xilinx.com>, <andrew.rybchenko@oktetlabs.ru>, <huangdaode@huawei.com>, <lihuisong@huawei.com> Subject: [PATCH 1/6] bus/pci: fix a segfault when call callback Date: Thu, 25 Aug 2022 10:57:14 +0800 Message-ID: <20220825025719.14281-2-lihuisong@huawei.com> In-Reply-To: <20220825025719.14281-1-lihuisong@huawei.com> References: <20220825025719.14281-1-lihuisong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	app/testpmd: support attach and detach port for MP \| [0/6] app/testpmd: support attach and detach port for MP [1/6] bus/pci: fix a segfault when call callback [2/6] bus/vdev: fix a segfault when call callback [3/6] ethdev: fix push new event [4/6] app/testpmd: check the validity of the port [5/6] app/testpmd: support attach and detach port for MP [6/6] app/testpmd: stop packet forwarding in new and destroy event

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

lihuisong (C) Aug. 25, 2022, 2:57 a.m. UTC

  After the driver probe is executed, the callback in application will
be called. The callback in application may call some APIs which access the
rte_pci_driver::driver by the device::driver pointer to get driver
information. If the rte_pci_device::device::driver pointer isn't pointed to
rte_pci_driver::driver in rte_pci_probe_one_driver, a segfault will occur.
For example, when ethdev driver probe completes, the callback in
application call rte_eth_dev_info_get which use dev->device->driver->name.
So rte_pci_device::device::driver should point to rte_pci_driver::driver
before executing the driver probe.

Fixes: c752998b5e2e ("pci: introduce library and driver")
Cc: stable@dpdk.org

Signed-off-by: Huisong Li <lihuisong@huawei.com>
---
 drivers/bus/pci/pci_common.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 37ab879779..831a9cd8c7 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -265,11 +265,22 @@  rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 			dr->driver.name, dev->id.vendor_id, dev->id.device_id,
 			loc->domain, loc->bus, loc->devid, loc->function,
 			dev->device.numa_node);
+
+	/*
+	 * After the driver probe is executed, the callback in application will
+	 * be called. The callback in application may call some APIs which use
+	 * dev->device.driver to get some driver information. If the driver
+	 * pointer isn't pointed to driver->driver here, a segfault will occur.
+	 */
+	if (!already_probed)
+		dev->device.driver = &dr->driver;
+
 	/* call the driver probe() function */
 	ret = dr->probe(dr, dev);
 	if (already_probed)
 		return ret; /* no rollback if already succeeded earlier */
 	if (ret) {
+		dev->device.driver = NULL;
 		dev->driver = NULL;
 		if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
 			/* Don't unmap if device is unsupported and
@@ -282,8 +293,6 @@  rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 		dev->vfio_req_intr_handle = NULL;
 		rte_intr_instance_free(dev->intr_handle);
 		dev->intr_handle = NULL;
-	} else {
-		dev->device.driver = &dr->driver;
 	}
 
 	return ret;