DPDK patches and discussions
 help / color / mirror / Atom feed
From: Zhangfei Gao <zhangfei.gao@linaro.org>
To: Anatoly Burakov <anatoly.burakov@intel.com>,
	Akhil Goyal <gakhil@marvell.com>,
	Fan Zhang <royzhang1980@gmail.com>,
	David Marchand <david.marchand@redhat.com>
Cc: dev@dpdk.org, acc@openeuler.org, Zhangfei Gao <zhangfei.gao@linaro.org>
Subject: [PATCH v2] bus/vdev: vdev_cleanup checks dev->device.driver
Date: Wed, 19 Oct 2022 21:56:06 +0800	[thread overview]
Message-ID: <20221019135606.1700219-1-zhangfei.gao@linaro.org> (raw)
In-Reply-To: <20221019104847.1699872-1-zhangfei.gao@linaro.org>

vdev_probe calls driver->probe and set dev->device.driver,
which will be NULL if probe fails.

In vdev_cleanup, drv = container_of(dev->device.driver)
drv will be !NULL in this case. anc cause 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 <zhangfei.gao@linaro.org>
---
v2: 
Suggested by David Marchand <david.marchand@redhat.com>
1. Add Fixes
2. "If dev->device.driver != NULL, then drv won't be NULL", so remove it

 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);
-- 
2.38.1


  parent reply	other threads:[~2022-10-19 14:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-19 10:48 [PATCH] " Zhangfei Gao
2022-10-19 11:39 ` David Marchand
2022-10-19 13:27   ` Zhangfei Gao
2022-10-19 13:37   ` Zhangfei Gao
2022-10-19 13:56 ` Zhangfei Gao [this message]
2022-10-19 14:08 ` [PATCH v2 resend] " Zhangfei Gao
2022-10-20 11:32   ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221019135606.1700219-1-zhangfei.gao@linaro.org \
    --to=zhangfei.gao@linaro.org \
    --cc=acc@openeuler.org \
    --cc=anatoly.burakov@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=gakhil@marvell.com \
    --cc=royzhang1980@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).