From: Volodymyr Fialko <vfialko@marvell.com>
To: dev@dpdk.org, "Bruce Richardson" <bruce.richardson@intel.com>,
"Kevin Laatz" <kevin.laatz@intel.com>,
"Morten Brørup" <mb@smartsharesystems.com>
Cc: <jerinj@marvell.com>, Volodymyr Fialko <vfialko@marvell.com>
Subject: [PATCH] bus: fix leak for devices without driver
Date: Sat, 7 Jan 2023 16:12:30 +0100 [thread overview]
Message-ID: <20230107151230.2539470-1-vfialko@marvell.com> (raw)
For devices not assigned to any driver, we leak a pci device object since
it is never freed from the PCI bus device list, reported by ASAN.
Fixes: 1cab1a40ea9b ("bus: cleanup devices on shutdown")
Signed-off-by: Volodymyr Fialko <vfialko@marvell.com>
---
drivers/bus/pci/pci_common.c | 3 ++-
drivers/bus/vdev/vdev.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index bc3a7f39fe..e32a9d517a 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -448,7 +448,7 @@ pci_cleanup(void)
int ret = 0;
if (drv == NULL || drv->remove == NULL)
- continue;
+ goto free;
ret = drv->remove(dev);
if (ret < 0) {
@@ -458,6 +458,7 @@ pci_cleanup(void)
dev->driver = NULL;
dev->device.driver = NULL;
+free:
/* free interrupt handles */
rte_intr_instance_free(dev->intr_handle);
dev->intr_handle = NULL;
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 41bc07dde7..7974b27295 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -578,18 +578,19 @@ vdev_cleanup(void)
int ret = 0;
if (dev->device.driver == NULL)
- continue;
+ goto free;
drv = container_of(dev->device.driver, const struct rte_vdev_driver, driver);
if (drv->remove == NULL)
- continue;
+ goto free;
ret = drv->remove(dev);
if (ret < 0)
error = -1;
dev->device.driver = NULL;
+free:
free(dev);
}
--
2.34.1
next reply other threads:[~2023-01-07 15:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-07 15:12 Volodymyr Fialko [this message]
2023-02-07 13:48 ` David Marchand
2023-02-08 11:30 ` Kevin Laatz
2023-02-09 13:22 ` [PATCH v2] " Volodymyr Fialko
2023-02-10 9:28 ` Kevin Laatz
2023-02-10 11:55 ` 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=20230107151230.2539470-1-vfialko@marvell.com \
--to=vfialko@marvell.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kevin.laatz@intel.com \
--cc=mb@smartsharesystems.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).