vfio/pci: Initialize rom_read_failed in vfio_pci_load_rom()
PATCH v2 1/1 vfio/pci: Initialize rom_read_failed in vfio_pci_load_rom()
When vfio_device_get_region_info() fails in vfio_pci_load_rom(), the function returns without setting vdev->rom_read_failed to true, and without allocating vdev->rom. This leaves vdev->rom as NULL.
--- hw/vfio/pci.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
hw/vfio/pci.c +6 -5
@@ -1027,7 +1027,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev) } } -static void vfio_pci_load_rom (VFIOPCIDevice *vdev) +static bool vfio_pci_load_rom (VFIOPCIDevice *vdev) {VFIODevice *vbasedev = &vdev->vbasedev;struct vfio_region_info *reg_info =NULL ;
@@ -1041,7 +1041,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)if (ret !=0 ) {error_report ("vfio: Error getting ROM info: %s" ,strerror (-ret)); -return ; +return false; } trace_vfio_pci_load_rom(vbasedev->name, (unsigned long)reg_info->size,
@@ -1052,12 +1052,11 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) vdev->rom_offset = reg_info->offset;if (!vdev->rom_size) { - vdev->rom_read_failed = true;error_report ("vfio-pci: Cannot read device rom at %s" , vbasedev->name);error_printf ("Device option ROM contents are probably invalid " "(check dmesg).\nSkip option ROM probe with rombar=0, " "or load from file with romfile=\n" ); -return ; +return false; } vdev->rom =g_malloc (size);
@@ -1113,6 +1112,8 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) data[6 ] = -csum; } } + +return true; }/* "Raw" read of underlying config space. */
@@ -1146,7 +1147,7 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)/* Load the ROM lazily when the guest tries to read it */ if (unlikely (!vdev->rom && !vdev->rom_read_failed)) { -vfio_pci_load_rom (vdev); + vdev->rom_read_failed = !vfio_pci_load_rom (vdev); } memcpy(&val, vdev->rom + addr,
Signature · 1 line
2.54.0
Quoted 9 lines · Mario Casquero
When
vfio_device_get_region_info()fails invfio_pci_load_rom(), the function returns without settingvdev->rom_read_failedto true, and without allocatingvdev->rom. This leavesvdev->romas NULL.Signed-off-by Mario Casquero <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/vfio/pci.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Applied to
https://github.com/legoater/qemu vfio-next
Thanks,
C.
Quoted 55 lines
hw/vfio/pci.c +6
-5@@ -1027,7 +1027,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev) } } -static void vfio_pci_load_rom (VFIOPCIDevice *vdev) +static bool vfio_pci_load_rom (VFIOPCIDevice *vdev) {VFIODevice *vbasedev = &vdev->vbasedev;struct vfio_region_info *reg_info =NULL ;@@ -1041,7 +1041,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)if (ret !=0 ) {error_report ("vfio: Error getting ROM info: %s" ,strerror (-ret)); -return ; +return false; } trace_vfio_pci_load_rom(vbasedev->name, (unsigned long)reg_info->size,@@ -1052,12 +1052,11 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) vdev->rom_offset = reg_info->offset;if (!vdev->rom_size) { - vdev->rom_read_failed = true;error_report ("vfio-pci: Cannot read device rom at %s" , vbasedev->name);error_printf ("Device option ROM contents are probably invalid " "(check dmesg).\nSkip option ROM probe with rombar=0, " "or load from file with romfile=\n" ); -return ; +return false; } vdev->rom =g_malloc (size);@@ -1113,6 +1112,8 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) data[6 ] = -csum; } } + +return true; }/* "Raw" read of underlying config space. */ @@ -1146,7 +1147,7 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)/* Load the ROM lazily when the guest tries to read it */ if (unlikely (!vdev->rom && !vdev->rom_read_failed)) { -vfio_pci_load_rom (vdev); + vdev->rom_read_failed = !vfio_pci_load_rom (vdev); } memcpy(&val, vdev->rom + addr,
Hi Mario,
Quoted 15 lines · Mario Casquero
When
vfio_device_get_region_info()fails invfio_pci_load_rom(), the function returns without settingvdev->rom_read_failedto true, and without allocatingvdev->rom. This leavesvdev->romas NULL.Signed-off-by Mario Casquero <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/vfio/pci.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)hw/vfio/pci.c +0
-0
hw/vfio/pci.c static void vfio_update_msi(VFIOPCIDevice *vdev) · line 1030
Quoted 5 lines
hw/vfio/pci.c +1
-1@@ -1027,7 +1027,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev) } } -static void vfio_pci_load_rom (VFIOPCIDevice *vdev) +static bool vfio_pci_load_rom (VFIOPCIDevice *vdev)
Since you are modifying this method signature, a bit nicer would be to have it take an Error* argument, and propagate it. Anyway my 2 cents.
Quoted 44 lines
hw/vfio/pci.c +5
-4{VFIODevice *vbasedev = &vdev->vbasedev;struct vfio_region_info *reg_info =NULL ;@@ -1041,7 +1041,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)if (ret !=0 ) {error_report ("vfio: Error getting ROM info: %s" ,strerror (-ret)); -return ; +return false; } trace_vfio_pci_load_rom(vbasedev->name, (unsigned long)reg_info->size,@@ -1052,12 +1052,11 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) vdev->rom_offset = reg_info->offset;if (!vdev->rom_size) { - vdev->rom_read_failed = true;error_report ("vfio-pci: Cannot read device rom at %s" , vbasedev->name);error_printf ("Device option ROM contents are probably invalid " "(check dmesg).\nSkip option ROM probe with rombar=0, " "or load from file with romfile=\n" ); -return ; +return false; } vdev->rom =g_malloc (size);@@ -1113,6 +1112,8 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) data[6 ] = -csum; } } + +return true; }/* "Raw" read of underlying config space. */ @@ -1146,7 +1147,7 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)/* Load the ROM lazily when the guest tries to read it */ if (unlikely (!vdev->rom && !vdev->rom_read_failed)) { -vfio_pci_load_rom (vdev); + vdev->rom_read_failed = !vfio_pci_load_rom (vdev); } memcpy(&val, vdev->rom + addr,