[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/10] virtio-blk: delete vqs on the error path in realize()
From: |
Michael S. Tsirkin |
Subject: |
[PULL 05/10] virtio-blk: delete vqs on the error path in realize() |
Date: |
Tue, 31 Mar 2020 10:57:10 -0400 |
From: Pan Nengyuan <address@hidden>
virtio_vqs forgot to free on the error path in realize(). Fix that.
The asan stack:
Direct leak of 14336 byte(s) in 1 object(s) allocated from:
#0 0x7f58b93fd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970)
#1 0x7f58b858249d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d)
#2 0x5562cc627f49 in virtio_add_queue /mnt/sdb/qemu/hw/virtio/virtio.c:2413
#3 0x5562cc4b524a in virtio_blk_device_realize
/mnt/sdb/qemu/hw/block/virtio-blk.c:1202
#4 0x5562cc613050 in virtio_device_realize
/mnt/sdb/qemu/hw/virtio/virtio.c:3615
#5 0x5562ccb7a568 in device_set_realized /mnt/sdb/qemu/hw/core/qdev.c:891
#6 0x5562cd39cd45 in property_set_bool /mnt/sdb/qemu/qom/object.c:2238
Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/block/virtio-blk.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 142863a3b2..97ba8a2187 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -1204,6 +1204,9 @@ static void virtio_blk_device_realize(DeviceState *dev,
Error **errp)
virtio_blk_data_plane_create(vdev, conf, &s->dataplane, &err);
if (err != NULL) {
error_propagate(errp, err);
+ for (i = 0; i < conf->num_queues; i++) {
+ virtio_del_queue(vdev, i);
+ }
virtio_cleanup(vdev);
return;
}
--
MST
- [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Michael S. Tsirkin, 2020/03/31
- [PULL 01/10] checkpatch: enforce process for expected files, Michael S. Tsirkin, 2020/03/31
- [PULL 02/10] MAINTAINERS: Add myself as virtio-balloon co-maintainer, Michael S. Tsirkin, 2020/03/31
- [PULL 03/10] virtio-serial-bus: Plug memory leak on realize() error paths, Michael S. Tsirkin, 2020/03/31
- [PULL 04/10] acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot(), Michael S. Tsirkin, 2020/03/31
- [PULL 06/10] virtio-iommu: avoid memleak in the unrealize, Michael S. Tsirkin, 2020/03/31
- [PULL 08/10] fix vhost_user_blk_watch crash, Michael S. Tsirkin, 2020/03/31
- [PULL 07/10] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest, Michael S. Tsirkin, 2020/03/31
- [PULL 10/10] vhost-vsock: fix double close() in the realize() error path, Michael S. Tsirkin, 2020/03/31
- [PULL 05/10] virtio-blk: delete vqs on the error path in realize(),
Michael S. Tsirkin <=
- [PULL 09/10] acpi: add acpi=OnOffAuto machine property to x86 and arm virt, Michael S. Tsirkin, 2020/03/31
- Re: [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Peter Maydell, 2020/03/31