[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroyin
From: |
Michael S. Tsirkin |
Subject: |
[PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroying them |
Date: |
Tue, 29 Sep 2020 03:21:18 -0400 |
From: Eric Auger <eric.auger@redhat.com>
If realize fails, domains and endpoints trees may be NULL. On
unrealize(), this produces assertions:
"GLib: g_tree_destroy: assertion 'tree != NULL' failed"
Check that the trees are non NULL before destroying them.
Cc: qemu-stable@nongnu.org
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200908193309.20569-2-eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-iommu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 5d56865e56..21ec63b108 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -801,8 +801,12 @@ static void virtio_iommu_device_unrealize(DeviceState *dev)
VirtIOIOMMU *s = VIRTIO_IOMMU(dev);
g_hash_table_destroy(s->as_by_busptr);
- g_tree_destroy(s->domains);
- g_tree_destroy(s->endpoints);
+ if (s->domains) {
+ g_tree_destroy(s->domains);
+ }
+ if (s->endpoints) {
+ g_tree_destroy(s->endpoints);
+ }
virtio_delete_queue(s->req_vq);
virtio_delete_queue(s->event_vq);
--
MST
- [PULL v4 00/48] virtio,pc,acpi: fixes, tests, Michael S. Tsirkin, 2020/09/29
- [PULL v4 03/48] vhost-vdpa: batch updating IOTLB mappings, Michael S. Tsirkin, 2020/09/29
- [PULL v4 05/48] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 04/48] virtio-mem: detach the element from the virtqueue when error occurs, Michael S. Tsirkin, 2020/09/29
- [PULL v4 06/48] vhost: recheck dev state in the vhost_migration_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 07/48] vhost: check queue state in the vhost_dev_set_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 08/48] tests/qtest/vhost-user-test: prepare the tests for adding new dev class, Michael S. Tsirkin, 2020/09/29
- [PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroying them,
Michael S. Tsirkin <=
- [PULL v4 11/48] virtio-iommu-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 09/48] cphp: remove deprecated cpu-add command(s), Michael S. Tsirkin, 2020/09/29
- [PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line(), Michael S. Tsirkin, 2020/09/29
- [PULL v4 14/48] vhost-vdpa: add trace-events, Michael S. Tsirkin, 2020/09/29
- [PULL v4 15/48] configure: Fix build dependencies with vhost-vdpa., Michael S. Tsirkin, 2020/09/29
- [PULL v4 16/48] virtio: skip legacy support check on machine types less than 5.1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 17/48] vhost-vsock-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 18/48] vhost-user-vsock-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 19/48] vhost-vsock-ccw: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use, Michael S. Tsirkin, 2020/09/29