Don't try to configure a BAR if there is no region associated with it.
Also move the variable declarations from inside the loop to the start of
the function for consistency.
Signed-off-by: Alexandru Elisei <alexandru.elisei@xxxxxxx>
---
vfio/pci.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/vfio/pci.c b/vfio/pci.c
index 1f38f90c3ae9..4412c6d7a862 100644
--- a/vfio/pci.c
+++ b/vfio/pci.c
@@ -645,16 +645,19 @@ static int vfio_pci_parse_cfg_space(struct vfio_device *vdev)
static int vfio_pci_fixup_cfg_space(struct vfio_device *vdev)
{
int i;
+ u64 base;
ssize_t hdr_sz;
struct msix_cap *msix;
struct vfio_region_info *info;
struct vfio_pci_device *pdev = &vdev->pci;
+ struct vfio_region *region;
/* Initialise the BARs */
for (i = VFIO_PCI_BAR0_REGION_INDEX; i <= VFIO_PCI_BAR5_REGION_INDEX; ++i) {
- u64 base;
- struct vfio_region *region = &vdev->regions[i];
+ if ((u32)i == vdev->info.num_regions)
+ break;
+ region = &vdev->regions[i];
/* Construct a fake reg to match what we've mapped. */
if (region->is_ioport) {
base = (region->port_base & PCI_BASE_ADDRESS_IO_MASK) |
@@ -853,11 +856,12 @@ static int vfio_pci_configure_bar(struct kvm *kvm, struct vfio_device *vdev,
u32 bar;
size_t map_size;
struct vfio_pci_device *pdev = &vdev->pci;
- struct vfio_region *region = &vdev->regions[nr];
+ struct vfio_region *region;
if (nr >= vdev->info.num_regions)
return 0;
+ region = &vdev->regions[nr];
bar = pdev->hdr.bar[nr];
region->vdev = vdev;
--
2.20.1
