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>,
	Pan Nengyuan <pannengyuan@huawei.com>,
	Eric Auger <eric.auger@redhat.com>
Subject: [PULL 06/10] virtio-iommu: avoid memleak in the unrealize
Date: Tue, 31 Mar 2020 10:57:14 -0400	[thread overview]
Message-ID: <20200331145631.135630-7-mst@redhat.com> (raw)
In-Reply-To: <20200331145631.135630-1-mst@redhat.com>

From: Pan Nengyuan <pannengyuan@huawei.com>

req_vq/event_vq forgot to free in unrealize. Fix that.
And also do clean 's->as_by_busptr' hash table in unrealize to fix another leak.

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Acked-by: Eric Auger <eric.auger@redhat.com>
Message-Id: <20200328005705.29898-3-pannengyuan@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio-iommu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 4cee8083bc..22ba8848c2 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -693,9 +693,12 @@ static void virtio_iommu_device_unrealize(DeviceState *dev, Error **errp)
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     VirtIOIOMMU *s = VIRTIO_IOMMU(dev);
 
+    g_hash_table_destroy(s->as_by_busptr);
     g_tree_destroy(s->domains);
     g_tree_destroy(s->endpoints);
 
+    virtio_delete_queue(s->req_vq);
+    virtio_delete_queue(s->event_vq);
     virtio_cleanup(vdev);
 }
 
-- 
MST



  parent reply	other threads:[~2020-03-31 15:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 14:56 [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 01/10] checkpatch: enforce process for expected files Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 02/10] MAINTAINERS: Add myself as virtio-balloon co-maintainer Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 03/10] virtio-serial-bus: Plug memory leak on realize() error paths Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 04/10] acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot() Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 05/10] virtio-blk: delete vqs on the error path in realize() Michael S. Tsirkin
2020-03-31 14:57 ` Michael S. Tsirkin [this message]
2020-03-31 14:57 ` [PULL 07/10] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 08/10] fix vhost_user_blk_watch crash Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 09/10] acpi: add acpi=OnOffAuto machine property to x86 and arm virt Michael S. Tsirkin
2020-03-31 14:57 ` [PULL 10/10] vhost-vsock: fix double close() in the realize() error path Michael S. Tsirkin
2020-03-31 16:56 ` [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers 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=20200331145631.135630-7-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=pannengyuan@huawei.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@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).