From: <pannengyuan@huawei.com> To: <mst@redhat.com> Cc: liyiting@huawei.com, "Laurent Vivier" <lvivier@redhat.com>, zhang.zhanghailiang@huawei.com, "Amit Shah" <amit@kernel.org>, "Pan Nengyuan" <pannengyuan@huawei.com>, qemu-devel@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, kuhn.chenqun@huawei.com Subject: [PATCH v2 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus Date: Wed, 4 Dec 2019 15:31:56 +0800 Message-ID: <1575444716-17632-3-git-send-email-pannengyuan@huawei.com> (raw) In-Reply-To: <1575444716-17632-1-git-send-email-pannengyuan@huawei.com> [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #0: Type: text/plain; charset="y", Size: 2195 bytes --] From: Pan Nengyuan <pannengyuan@huawei.com> ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in virtio_serial_device_unrealize, the memory leak stack is as bellow: Direct leak of 1290240 byte(s) in 180 object(s) allocated from: #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560) #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015) #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327 #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089 #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504 #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876 #6 0x5650e0531efd in property_set_bool qom/object.c:2080 #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26 #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338 #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801 Reported-by: Euler Robot <euler.robot@huawei.com> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com> Cc: Laurent Vivier <lvivier@redhat.com> Cc: Amit Shah <amit@kernel.org> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> --- Changes v2 to v1: - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by Michael S. Tsirkin) --- hw/char/virtio-serial-bus.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 3325904..e1cbce3 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSerial *vser = VIRTIO_SERIAL(dev); + int i; QLIST_REMOVE(vser, next); + virtio_delete_queue(vser->c_ivq); + virtio_delete_queue(vser->c_ovq); + for (i = 0; i < vser->bus.max_nr_ports; i++) { + virtio_delete_queue(vser->ivqs[i]); + virtio_delete_queue(vser->ovqs[i]); + } + g_free(vser->ivqs); g_free(vser->ovqs); g_free(vser->ports_map); -- 2.7.2.windows.1
next prev parent reply index Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-04 7:31 [PATCH v2 1/3] virtio: add ability to delete vq through a pointer pannengyuan 2019-12-04 7:31 ` [PATCH v2 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device pannengyuan 2019-12-04 10:16 ` Laurent Vivier 2019-12-04 7:31 ` pannengyuan [this message] 2019-12-04 10:17 ` [PATCH v2 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus Laurent Vivier 2019-12-04 14:41 ` Eric Blake 2019-12-09 16:51 ` Michael S. Tsirkin 2019-12-04 8:33 ` [PATCH v2 1/3] virtio: add ability to delete vq through a pointer Pankaj Gupta 2019-12-05 2:30 ` Pan Nengyuan 2019-12-05 4:51 ` Pankaj Gupta 2019-12-09 15:58 ` Michael S. Tsirkin 2019-12-04 9:40 ` Laurent Vivier 2019-12-04 14:40 ` Eric Blake 2019-12-05 2:35 ` Pan Nengyuan 2019-12-05 16:45 ` Amit Shah 2019-12-06 2:17 ` Pan Nengyuan 2019-12-06 8:56 ` Amit Shah 2019-12-06 9:00 ` Pan Nengyuan 2019-12-09 16:43 ` Michael S. Tsirkin 2019-12-09 16:58 ` Michael S. Tsirkin 2019-12-10 2:08 ` Pan Nengyuan
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=1575444716-17632-3-git-send-email-pannengyuan@huawei.com \ --to=pannengyuan@huawei.com \ --cc=amit@kernel.org \ --cc=kuhn.chenqun@huawei.com \ --cc=liyiting@huawei.com \ --cc=lvivier@redhat.com \ --cc=marcandre.lureau@redhat.com \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=zhang.zhanghailiang@huawei.com \ /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
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git