From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 1/9] virtio-iommu: Fix error handling in virtio_iommu_set_host_iova_ranges()
Date: Tue, 9 Jul 2024 13:50:09 +0200 [thread overview]
Message-ID: <20240709115017.798043-2-clg@redhat.com> (raw)
In-Reply-To: <20240709115017.798043-1-clg@redhat.com>
From: Eric Auger <eric.auger@redhat.com>
In case no IOMMUPciBus/IOMMUDevice are found we need to properly
set the error handle and return.
Fixes : Coverity CID 1549006
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Fixes: cf2647a76e ("virtio-iommu: Compute host reserved regions")
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-iommu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 7c54c6b5e260e65b555e63809ed247254c785d3f..8fe69ab094f501fced7098f1ba790c26e63aa775 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -563,10 +563,15 @@ static int virtio_iommu_set_host_iova_ranges(VirtIOIOMMU *s, PCIBus *bus,
int ret = -EINVAL;
if (!sbus) {
- error_report("%s no sbus", __func__);
+ error_setg(errp, "%s: no IOMMUPciBus found!", __func__);
+ return ret;
}
sdev = sbus->pbdev[devfn];
+ if (!sdev) {
+ error_setg(errp, "%s: no IOMMUDevice found!", __func__);
+ return ret;
+ }
current_ranges = sdev->host_resv_ranges;
--
2.45.2
next prev parent reply other threads:[~2024-07-09 11:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 11:50 [PULL 0/9] vfio queue Cédric Le Goater
2024-07-09 11:50 ` Cédric Le Goater [this message]
2024-07-09 11:50 ` [PULL 2/9] vfio-container-base: Introduce vfio_container_get_iova_ranges() helper Cédric Le Goater
2024-07-09 11:50 ` [PULL 3/9] HostIOMMUDevice : remove Error handle from get_iova_ranges callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 4/9] HostIOMMUDevice: Introduce get_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 5/9] virtio-iommu : Retrieve page size mask on virtio_iommu_set_iommu_device() Cédric Le Goater
2024-07-09 11:50 ` [PULL 6/9] memory: remove IOMMU MR iommu_set_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 7/9] virtio-iommu: Revert transient enablement of IOMMU MR in bypass mode Cédric Le Goater
2024-07-09 11:50 ` [PULL 8/9] vfio/display: Fix potential memleak of edid info Cédric Le Goater
2024-07-09 11:50 ` [PULL 9/9] vfio/display: Fix vfio_display_edid_init() error path Cédric Le Goater
2024-07-09 17:26 ` [PULL 0/9] vfio queue Richard Henderson
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=20240709115017.798043-2-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenzhong.duan@intel.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).