[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 01/10] virtio-iommu: Fix virtio_iommu_mr()
From: |
Jean-Philippe Brucker |
Subject: |
[PATCH v11 01/10] virtio-iommu: Fix virtio_iommu_mr() |
Date: |
Fri, 30 Oct 2020 19:05:01 +0100 |
Due to an invalid mask, virtio_iommu_mr() may return the wrong memory
region. It hasn't been too problematic so far because the function was
only used to test existence of an endpoint, but that is about to change.
Fixes: cfb42188b24d ("virtio-iommu: Implement attach/detach command")
Cc: QEMU Stable <qemu-stable@nongnu.org>
Acked-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
hw/virtio/virtio-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 21ec63b1082..4c8f3909b7d 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -101,7 +101,7 @@ static IOMMUMemoryRegion *virtio_iommu_mr(VirtIOIOMMU *s,
uint32_t sid)
bus_n = PCI_BUS_NUM(sid);
iommu_pci_bus = iommu_find_iommu_pcibus(s, bus_n);
if (iommu_pci_bus) {
- devfn = sid & PCI_DEVFN_MAX;
+ devfn = sid & (PCI_DEVFN_MAX - 1);
dev = iommu_pci_bus->pbdev[devfn];
if (dev) {
return &dev->iommu_mr;
--
2.29.1
- [PATCH v11 00/10] virtio-iommu: VFIO integration, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 01/10] virtio-iommu: Fix virtio_iommu_mr(),
Jean-Philippe Brucker <=
- [PATCH v11 04/10] virtio-iommu: Call memory notifiers in attach/detach, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 03/10] virtio-iommu: Add memory notifiers for map/unmap, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 06/10] virtio-iommu: Add notify_flag_changed() memory region callback, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 02/10] virtio-iommu: Store memory region in endpoint struct, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 09/10] virtio-iommu: Set supported page size mask, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 08/10] vfio: Set IOMMU page size as per host supported page size, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 10/10] vfio: Don't issue full 2^64 unmap, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 05/10] virtio-iommu: Add replay() memory region callback, Jean-Philippe Brucker, 2020/10/30
- [PATCH v11 07/10] memory: Add interface to set iommu page size mask, Jean-Philippe Brucker, 2020/10/30