qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Cornelia Huck <cohuck@redhat.com>,
	qemu-stable@nongnu.org, Eric Auger <eric.auger@redhat.com>
Subject: [PULL 14/15] virtio-iommu: Check gtrees are non null before destroying them
Date: Fri, 18 Sep 2020 11:06:27 -0400	[thread overview]
Message-ID: <20200918150506.286890-15-mst@redhat.com> (raw)
In-Reply-To: <20200918150506.286890-1-mst@redhat.com>

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



  parent reply	other threads:[~2020-09-18 15:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-18 15:05 [PULL 00/15] virtio,pc,acpi: fixes, tests Michael S. Tsirkin
2020-09-18 15:05 ` [PULL 01/15] linux headers: sync to 5.9-rc4 Michael S. Tsirkin
2020-09-18 15:05 ` [PULL 03/15] vhost-vdpa: batch updating IOTLB mappings Michael S. Tsirkin
2020-09-18 15:06   ` Michael S. Tsirkin
2020-09-18 15:05 ` [PULL 04/15] virtio-mem: detach the element from the virtqueue when error occurs Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 05/15] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 06/15] vhost: recheck dev state in the vhost_migration_log routine Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 07/15] vhost: check queue state in the vhost_dev_set_log routine Michael S. Tsirkin
2020-09-18 15:30   ` Raphael Norwitz
2020-09-18 15:06 ` [PULL 08/15] tests/qtest/vhost-user-test: prepare the tests for adding new dev class Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 10/15] tests/qtest/vhost-user-test: add support for the vhost-user-blk device Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 11/15] tests/qtest/vhost-user-test: add migrate_reconnect test Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 12/15] tests/qtest/vhost-user-test: enable the reconnect tests Michael S. Tsirkin
2020-09-18 15:06 ` [PULL 13/15] cphp: remove deprecated cpu-add command(s) Michael S. Tsirkin
2020-09-18 15:06 ` Michael S. Tsirkin [this message]
2020-09-18 15:06 ` [PULL 15/15] virtio-iommu-pci: force virtio version 1 Michael S. Tsirkin
2020-09-18 15:10 ` [PULL 00/15] virtio,pc,acpi: fixes, tests Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200918150506.286890-15-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).