[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/21] vhost: ensure vhost_ops are set before calling
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 17/21] vhost: ensure vhost_ops are set before calling iotlb callback |
Date: |
Mon, 3 Jul 2017 22:45:45 +0300 |
From: Maxime Coquelin <address@hidden>
This patch fixes a crash that happens when vhost-user iommu
support is enabled and vhost-user socket is closed.
When it happens, if an IOTLB invalidation notification is sent
by the IOMMU, vhost_ops's NULL pointer is dereferenced.
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost-backend.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index 4e31de1..cb055e8 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -309,7 +309,10 @@ int vhost_backend_update_device_iotlb(struct vhost_dev
*dev,
return -EINVAL;
}
- return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);
+ if (dev->vhost_ops && dev->vhost_ops->vhost_send_device_iotlb_msg)
+ return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);
+
+ return -ENODEV;
}
int vhost_backend_invalidate_device_iotlb(struct vhost_dev *dev,
@@ -321,7 +324,10 @@ int vhost_backend_invalidate_device_iotlb(struct vhost_dev
*dev,
imsg.size = len;
imsg.type = VHOST_IOTLB_INVALIDATE;
- return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);
+ if (dev->vhost_ops && dev->vhost_ops->vhost_send_device_iotlb_msg)
+ return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);
+
+ return -ENODEV;
}
int vhost_backend_handle_iotlb_msg(struct vhost_dev *dev,
--
MST
- [Qemu-devel] [PULL 07/21] pci: Make errp the last parameter of pci_add_capability(), (continued)
- [Qemu-devel] [PULL 07/21] pci: Make errp the last parameter of pci_add_capability(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 08/21] pci: Replace pci_add_capability2() with pci_add_capability(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 09/21] pci: Convert to realize, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 10/21] pci: Convert shpc_init() to Error, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 11/21] i386/kvm/pci-assign: Fix return type of verify_irqchip_kernel(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 12/21] i386/kvm/pci-assign: Use errp directly rather than local_err, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 15/21] hw/acpi: remove dead acpi code, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 14/21] fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 13/21] fw_cfg: don't map the fw_cfg IO ports in fw_cfg_io_realize(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 16/21] intel_iommu: fix migration breakage on mr switch, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 17/21] vhost: ensure vhost_ops are set before calling iotlb callback,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 18/21] vhost-user: unregister slave req handler at cleanup time, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 20/21] virtio-net: fix tx queue size for !vhost-user, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 21/21] i386/acpi: update expected acpi files, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Michael S. Tsirkin, 2017/07/03
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Peter Maydell, 2017/07/11
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Ben Warren, 2017/07/11
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Peter Maydell, 2017/07/11
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Peter Maydell, 2017/07/11
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Michael S. Tsirkin, 2017/07/11
- Re: [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Peter Maydell, 2017/07/11