From: weimin xiong <15927021679@163.com>
To: Jean-Philippe Brucker <jpb@kernel.org>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>,
virtualization@lists.linux.dev, iommu@lists.linux.dev,
linux-kernel@vger.kernel.org,
Xiong Weimin <xiongweimin@kylinos.cn>
Subject: [PATCH v1 1/2] iommu/virtio: Avoid use-after-put in viommu_get_by_fwnode
Date: Tue, 14 Jul 2026 10:49:48 +0800 [thread overview]
Message-ID: <20260714024949.190014-2-15927021679@163.com> (raw)
In-Reply-To: <20260714024949.190014-1-15927021679@163.com>
From: Xiong Weimin <xiongweimin@kylinos.cn>
bus_find_device() returns a device reference that must be released with
put_device(). viommu_get_by_fwnode() currently drops that reference
before dereferencing the device to fetch the virtio-IOMMU private data.
Fetch the private data while the reference is still held, then release
the device reference before returning.
Signed-off-by: Xiong Weimin <xiongweimin@kylinos.cn>
---
drivers/iommu/virtio-iommu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index 587fc1319..342785c76 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -1009,12 +1009,16 @@ static int viommu_match_node(struct device *dev, const void *data)
static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
{
+ struct viommu_dev *viommu = NULL;
struct device *dev = bus_find_device(virtio_bus_type, NULL, fwnode,
viommu_match_node);
- put_device(dev);
+ if (dev) {
+ viommu = dev_to_virtio(dev)->priv;
+ put_device(dev);
+ }
- return dev ? dev_to_virtio(dev)->priv : NULL;
+ return viommu;
}
static struct iommu_device *viommu_probe_device(struct device *dev)
--
2.43.0
next prev parent reply other threads:[~2026-07-14 2:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-14 2:49 [PATCH v1 0/2] iommu/virtio: Fix probe error handling weimin xiong
2026-07-14 2:49 ` weimin xiong [this message]
2026-07-14 2:49 ` [PATCH v1 2/2] iommu/virtio: Handle iommu_device_register() failures weimin xiong
2026-07-15 11:46 ` Will Deacon
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=20260714024949.190014-2-15927021679@163.com \
--to=15927021679@163.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=jpb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=virtualization@lists.linux.dev \
--cc=will@kernel.org \
--cc=xiongweimin@kylinos.cn \
/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