[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/13] virtio-pci: Added check for virtio device in PCI config cbs
From: |
Michael S. Tsirkin |
Subject: |
[PULL 05/13] virtio-pci: Added check for virtio device in PCI config cbs. |
Date: |
Wed, 7 Jul 2021 11:03:09 -0400 |
From: Andrew Melnychenko <andrew@daynix.com>
Now, if virtio device is not present on virtio-bus - pci config callbacks
will not lead to possible crush. The read will return "-1" which should be
interpreted by a driver that pci device may be unplugged.
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Message-Id: <20210609095843.141378-3-andrew@daynix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 1bef7a2be8..c0d9c47df7 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -424,6 +424,11 @@ static uint64_t virtio_pci_config_read(void *opaque,
hwaddr addr,
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
uint32_t config = VIRTIO_PCI_CONFIG_SIZE(&proxy->pci_dev);
uint64_t val = 0;
+
+ if (vdev == NULL) {
+ return UINT64_MAX;
+ }
+
if (addr < config) {
return virtio_ioport_read(proxy, addr);
}
@@ -455,6 +460,11 @@ static void virtio_pci_config_write(void *opaque, hwaddr
addr,
VirtIOPCIProxy *proxy = opaque;
uint32_t config = VIRTIO_PCI_CONFIG_SIZE(&proxy->pci_dev);
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
+
+ if (vdev == NULL) {
+ return;
+ }
+
if (addr < config) {
virtio_ioport_write(proxy, addr, val);
return;
--
MST
- [PULL 00/13] pc,pci,virtio: bugfixes, improvements, Michael S. Tsirkin, 2021/07/07
- [PULL 01/13] virtio: disable ioeventfd for record/replay, Michael S. Tsirkin, 2021/07/07
- [PULL 03/13] hw/pci-host/q35: Ignore write of reserved PCIEXBAR LENGTH field, Michael S. Tsirkin, 2021/07/07
- [PULL 05/13] virtio-pci: Added check for virtio device in PCI config cbs.,
Michael S. Tsirkin <=
- [PULL 04/13] virtio-pci: Added check for virtio device presence in mm callbacks., Michael S. Tsirkin, 2021/07/07
- [PULL 02/13] virtio: Clarify MR transaction optimization, Michael S. Tsirkin, 2021/07/07
- [PULL 06/13] virtio-pci: Changed return values for "notify", "device" and "isr" read., Michael S. Tsirkin, 2021/07/07
- [PULL 07/13] migration: failover: reset partially_hotplugged, Michael S. Tsirkin, 2021/07/07
- [PULL 08/13] tests: acpi: prepare for changing DSDT tables, Michael S. Tsirkin, 2021/07/07
- [PULL 09/13] acpi: pc: revert back to v5.2 PCI slot enumeration, Michael S. Tsirkin, 2021/07/07
- [PULL 10/13] tests: acpi: pc: update expected DSDT blobs, Michael S. Tsirkin, 2021/07/07
- [PULL 11/13] acpi/ged: fix reset cause, Michael S. Tsirkin, 2021/07/07
- [PULL 12/13] docs: add slot when adding new PCIe root port, Michael S. Tsirkin, 2021/07/07
- [PULL 13/13] MAINTAINERS: Add maintainer for vhost-user RNG implementation, Michael S. Tsirkin, 2021/07/07