diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2015-01-09 08:50:53 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2015-01-09 08:50:53 -0700 |
| commit | 29c6e6df492d81b1843e5dd999171bb84c6effea (patch) | |
| tree | c44463c337e892638b5031e542059989ffef8e3e /hw/vfio | |
| parent | 59a0419856c9ed24e9ecd033db092b2e8f81a728 (diff) | |
| download | qemu-29c6e6df492d81b1843e5dd999171bb84c6effea.zip qemu-29c6e6df492d81b1843e5dd999171bb84c6effea.tar.gz qemu-29c6e6df492d81b1843e5dd999171bb84c6effea.tar.bz2 | |
vfio-pci: Fix BAR size overflow
We use an unsigned int when working with the PCI BAR size, which can
obviously overflow if the BAR is 4GB or larger. This needs to change
to a fixed length uint64_t. A similar issue is possible, though even
more unlikely, when mapping the region above an MSI-X table. The
start of the MSI-X vector table must be below 4GB, but the end, and
therefore the start of the next mapping region, could still land at
4GB.
Suggested-by: Nishank Trivedi <nishank.trivedi@netapp.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Don Slutz <dslutz@verizon.com>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Diffstat (limited to 'hw/vfio')
| -rw-r--r-- | hw/vfio/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index b4e73d1..b6703c7 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2301,7 +2301,7 @@ static void vfio_unmap_bar(VFIOPCIDevice *vdev, int nr) static void vfio_map_bar(VFIOPCIDevice *vdev, int nr) { VFIOBAR *bar = &vdev->bars[nr]; - unsigned size = bar->region.size; + uint64_t size = bar->region.size; char name[64]; uint32_t pci_bar; uint8_t type; @@ -2351,7 +2351,7 @@ static void vfio_map_bar(VFIOPCIDevice *vdev, int nr) } if (vdev->msix && vdev->msix->table_bar == nr) { - unsigned start; + uint64_t start; start = HOST_PAGE_ALIGN(vdev->msix->table_offset + (vdev->msix->entries * PCI_MSIX_ENTRY_SIZE)); |