summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2015-04-28 11:14:02 -0600
committerAlex Williamson <alex.williamson@redhat.com>2015-04-28 11:14:02 -0600
commit07ceaf98800519ef9c5dc893af00f1fe1f9144e4 (patch)
treecd082239429f6870ebd9f78df3df0e1677fe97b4 /hw
parent84cbd63f87c1d246f51ec8eee5367a5588f367fd (diff)
downloadhqemu-07ceaf98800519ef9c5dc893af00f1fe1f9144e4.zip
hqemu-07ceaf98800519ef9c5dc893af00f1fe1f9144e4.tar.gz
vfio-pci: Further fix BAR size overflow
In an analysis by Laszlo, the resulting type of our calculation for the end of the MSI-X table, and thus the start of memory after the table, is uint32_t. We're therefore not correctly preventing the corner case overflow that we intended to fix here where a BAR >=4G could place the MSI-X table to end exactly at the 4G boundary. The MSI-X table offset is defined by the hardware spec to 32bits, so we simply use a cast rather than changing data structure types. This scenario is purely theoretically, typically the MSI-X table is located at the front of the BAR. Reported-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/vfio/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index cd15b20..495f5fd 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2400,7 +2400,7 @@ static void vfio_map_bar(VFIOPCIDevice *vdev, int nr)
if (vdev->msix && vdev->msix->table_bar == nr) {
uint64_t start;
- start = HOST_PAGE_ALIGN(vdev->msix->table_offset +
+ start = HOST_PAGE_ALIGN((uint64_t)vdev->msix->table_offset +
(vdev->msix->entries * PCI_MSIX_ENTRY_SIZE));
size = start < bar->region.size ? bar->region.size - start : 0;
OpenPOWER on IntegriCloud