c4dab45526
- qga/win32: Use rundll for VSS installation - qga/win32: Remove change action from MSI installer - ide: Increment BB in-flight counter for TRIM BH - hw/pci-bridge/pxb: Fix missing swizzle - host-vdpa: make notifiers _init()/_uninit() symmetric - hw/virtio: vdpa: Fix leak of host-notifier memory-region - accel/tcg/cpu-exec: Fix precise single-stepping after interrupt - Allow setting up to 8 bytes with the generic loader - hw/net/virtio-net: make some VirtIONet const - accel/tcg: Optimize jump cache flush during tlb range flush - 9pfs: prevent opening special files (CVE-2023-2861) - tcg: Reduce tcg_assert_listed_vecop() scope - gitlab: Disable plugins for cross-i386-tci - vfio/pci: Fix a segfault in vfio_realize - block/iscsi: fix double-free on BUSY or similar statuses - tests/tcg: fix unused variable in linux-test - hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value - qga/vss-win32: fix warning for clang++-15 - vnc: avoid underflow when accessing user-provided address - block/monitor: Fix crash when executing HMP commit - virtio-gpu: add a FIXME for virtio_gpu_load() - hw/ppc/Kconfig: MAC_NEWWORLD should always select USB_OHCI_PCI - migration: report compress thread pid to libvirt Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 22e8d7076800d7c62e41e8c69fc01444cf00d451 Mon Sep 17 00:00:00 2001
|
|
From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 30 Jun 2023 21:05:23 +0800
|
|
Subject: [PATCH] vfio/pci: Fix a segfault in vfio_realize
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The kvm irqchip notifier is only registered if the device supports
|
|
INTx, however it's unconditionally removed in vfio realize error
|
|
path. If the assigned device does not support INTx, this will cause
|
|
QEMU to crash when vfio realize fails. Change it to conditionally
|
|
remove the notifier only if the notify hook is setup.
|
|
|
|
Before fix:
|
|
(qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,xres=1
|
|
Connection closed by foreign host.
|
|
|
|
After fix:
|
|
(qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,xres=1
|
|
Error: vfio 0000:81:11.1: xres and yres properties require display=on
|
|
(qemu)
|
|
|
|
Fixes: c5478fea27ac ("vfio/pci: Respond to KVM irqchip change notifier")
|
|
|
|
cheery-pick from 357bd7932a136613d700ee8bc83e9165f059d1f7
|
|
|
|
Signed-off-by: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
|
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
---
|
|
hw/vfio/pci.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
|
|
index 7b45353ce2..b085389ff8 100644
|
|
--- a/hw/vfio/pci.c
|
|
+++ b/hw/vfio/pci.c
|
|
@@ -3112,7 +3112,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
|
|
|
|
out_deregister:
|
|
pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
|
|
- kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
|
|
+ if (vdev->irqchip_change_notifier.notify) {
|
|
+ kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
|
|
+ }
|
|
out_teardown:
|
|
vfio_teardown_msi(vdev);
|
|
vfio_bars_exit(vdev);
|
|
--
|
|
2.41.0.windows.1
|
|
|