From 3f27defe0c1c7b5ef0ab866f0d7ae10db84face1 Mon Sep 17 00:00:00 2001 From: Zhangfei Gao Date: Wed, 19 Oct 2022 22:08:01 +0800 Subject: [PATCH] bus/vdev: fix crash in device cleanup vdev_probe calls driver->probe and set dev->device.driver, which will be NULL if the probe fails. In vdev_cleanup, drv = container_of(dev->device.driver) drv will be !NULL in this case, causing drv->remove Segmentation fault. Fixed by checking dev->device.driver before. Log: $ sudo dpdk-test --vdev=crypto_uadk --log-level=6 vdev_probe(): failed to initialize crypto_uadk device EAL: Bus (vdev) probe failed. RTE>>quit Segmentation fault Fixes: 1cab1a40ea9b ("bus: cleanup devices on shutdown") Signed-off-by: Zhangfei Gao Reviewed-by: David Marchand --- drivers/bus/vdev/vdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index f5b43f1930..41bc07dde7 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -577,9 +577,12 @@ vdev_cleanup(void) const struct rte_vdev_driver *drv; int ret = 0; + if (dev->device.driver == NULL) + continue; + drv = container_of(dev->device.driver, const struct rte_vdev_driver, driver); - if (drv == NULL || drv->remove == NULL) + if (drv->remove == NULL) continue; ret = drv->remove(dev);