public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vfio: Fix null pointer dereference bug in vfio_bars_finalize()

Browse source 
vfio_realize() has the following flow:
1. vfio_bars_prepare() -- sets VFIOBAR->size.
2. msix_early_setup().
3. vfio_bars_register() -- allocates VFIOBAR->mr.

After vfio_bars_prepare() is called msix_early_setup() can fail. If it
does fail, vfio_bars_register() is never called and VFIOBAR->mr is not
allocated.

In this case, vfio_bars_finalize() is called as part of the error flow
to free the bars' resources. However, vfio_bars_finalize() calls
object_unparent() for VFIOBAR->mr after checking only VFIOBAR->size, and
thus we get a null pointer dereference.

Fix it by checking VFIOBAR->mr in vfio_bars_finalize().

Fixes: 89d5202edc ("vfio/pci: Allow relocating MSI-X MMIO")
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Avihai Horon 2023-07-04 16:39:27 +03:00 committed by Cédric Le Goater
parent d4a2af747d
commit 8af87a3ec7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/vfio/pci.c
View file

@ -1752,9 +1752,11 @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)
vfio_bar_quirk_finalize(vdev, i); vfio_bar_quirk_finalize(vdev, i);
vfio_region_finalize(&bar->region); vfio_region_finalize(&bar->region);
if (bar->size) { if (bar->mr) {
assert(bar->size);
object_unparent(OBJECT(bar->mr)); object_unparent(OBJECT(bar->mr));
g_free(bar->mr); g_free(bar->mr);
bar->mr = NULL;
} }
} }