[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 20/21] vfio-pci: Loosen sanity checks to allow futu
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 20/21] vfio-pci: Loosen sanity checks to allow future features |
Date: |
Wed, 16 Jan 2013 10:49:22 -0600 |
From: Alex Williamson <address@hidden>
VFIO_PCI_NUM_REGIONS and VFIO_PCI_NUM_IRQS should never have been
used in this manner as it locks a specific kernel implementation.
Future features may introduce new regions or interrupt entries
(VGA may add legacy ranges, AER might add an IRQ for error
signalling). Fix this before it gets us into trouble.
Signed-off-by: Alex Williamson <address@hidden>
Cc: address@hidden
(cherry picked from commit 8fc94e5a8046e349e07976f9bcaffbcd5833f3a2)
Signed-off-by: Michael Roth <address@hidden>
---
hw/vfio_pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 46dce55..283842d 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -1837,13 +1837,13 @@ static int vfio_get_device(VFIOGroup *group, const char
*name, VFIODevice *vdev)
error_report("Warning, device %s does not support reset\n", name);
}
- if (dev_info.num_regions != VFIO_PCI_NUM_REGIONS) {
+ if (dev_info.num_regions < VFIO_PCI_CONFIG_REGION_INDEX + 1) {
error_report("vfio: unexpected number of io regions %u\n",
dev_info.num_regions);
goto error;
}
- if (dev_info.num_irqs != VFIO_PCI_NUM_IRQS) {
+ if (dev_info.num_irqs < VFIO_PCI_MSIX_IRQ_INDEX + 1) {
error_report("vfio: unexpected number of irqs %u\n",
dev_info.num_irqs);
goto error;
}
--
1.7.9.5
- [Qemu-stable] [PATCH 01/21] Fix semaphores fallback code, (continued)
- [Qemu-stable] [PATCH 01/21] Fix semaphores fallback code, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 03/21] Fix off-by-1 error in RAM migration code, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 05/21] target-mips: Fix incorrect code and test for INSV, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 06/21] target-mips: Fix incorrect shift for SHILO and SHILOV, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 04/21] migration: Fix madvise breakage if host and guest have different page sizes, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 07/21] vfio-pci: Don't use kvm_irqchip_in_kernel, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 11/21] target-xtensa: fix ITLB/DTLB page protection flags, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 12/21] qxl: save qemu_create_displaysurface_from result, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 10/21] pixman: fix vnc tight png/jpeg support, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 16/21] buffered_file: do not send more than s->bytes_xfer bytes per tick, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 20/21] vfio-pci: Loosen sanity checks to allow future features,
Michael Roth <=
- [Qemu-stable] [PATCH 14/21] e1000: Discard oversized packets based on SBP|LPE, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 18/21] vfio-pci: Make host MSI-X enable track guest, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 13/21] qxl+vnc: register a vm state change handler for dummy spice_server, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 17/21] target-xtensa: fix search_pc for the last TB opcode, Michael Roth, 2013/01/16
- Re: [Qemu-stable] Patch Round-up for stable 1.3.1, freeze Monday, Michael Tokarev, 2013/01/16
- [Qemu-stable] [PATCH 19/21] pci-assign: Enable MSIX on device to match guest, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 15/21] migration: fix migration_bitmap leak, Michael Roth, 2013/01/16
- [Qemu-stable] [PATCH 21/21] raw-posix: fix bdrv_aio_ioctl, Michael Roth, 2013/01/16