12286f39d2
- Include upstream patches designated as stable material and reviewed for applicability to include here. NOTE that the PIIX4 patch has migration implications: the change will also be applied to the SLE-15-SP2 qemu, and a live migration from that version to this SLE-15-SP3 qemu would require this patch to be applied for a successful migration if PIIX4 southbridge is used in the machine emulation (x86 i440fx) block-rbd-fix-memory-leak-in-qemu_rbd_co.patch block-rbd-Fix-memory-leak-in-qemu_rbd_co.patch cpu-core-Fix-help-of-CPU-core-device-typ.patch hw-arm-virt-acpi-build-Fix-GSIV-values-o.patch hw-block-fdc-Fix-fallback-property-on-sy.patch hw-isa-Kconfig-Add-missing-dependency-VI.patch hw-isa-piix4-Migrate-Reset-Control-Regis.patch hw-virtio-pci-Added-AER-capability.patch hw-virtio-pci-Added-counter-for-pcie-cap.patch s390x-css-report-errors-from-ccw_dstream.patch target-xtensa-fix-meson.build-rule-for-x.patch util-fix-use-after-free-in-module_load_o.patch virtio-pci-compat-page-aligned-ATS.patch OBS-URL: https://build.opensuse.org/request/show/885459 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=634
75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From: Stefano Garzarella <sgarzare@redhat.com>
|
|
Date: Mon, 29 Mar 2021 17:01:28 +0200
|
|
Subject: block/rbd: fix memory leak in qemu_rbd_connect()
|
|
|
|
Git-commit: c1c1f6cf511496b985cb9a1c536d59c9be7b9317
|
|
|
|
In qemu_rbd_connect(), 'mon_host' is allocated by qemu_rbd_mon_host()
|
|
using g_strjoinv(), but it's only freed in the error path, leaking
|
|
memory in the success path as reported by valgrind:
|
|
|
|
80 bytes in 4 blocks are definitely lost in loss record 5,028 of 6,516
|
|
at 0x4839809: malloc (vg_replace_malloc.c:307)
|
|
by 0x5315BB8: g_malloc (in /usr/lib64/libglib-2.0.so.0.6600.8)
|
|
by 0x532B6FF: g_strjoinv (in /usr/lib64/libglib-2.0.so.0.6600.8)
|
|
by 0x87D07E: qemu_rbd_mon_host (rbd.c:538)
|
|
by 0x87D07E: qemu_rbd_connect (rbd.c:562)
|
|
by 0x87E1CE: qemu_rbd_open (rbd.c:740)
|
|
by 0x840EB1: bdrv_open_driver (block.c:1528)
|
|
by 0x8453A9: bdrv_open_common (block.c:1802)
|
|
by 0x8453A9: bdrv_open_inherit (block.c:3444)
|
|
by 0x8464C2: bdrv_open (block.c:3537)
|
|
by 0x8108CD: qmp_blockdev_add (blockdev.c:3569)
|
|
by 0x8EA61B: qmp_marshal_blockdev_add (qapi-commands-block-core.c:1086)
|
|
by 0x90B528: do_qmp_dispatch_bh (qmp-dispatch.c:131)
|
|
by 0x907EA4: aio_bh_poll (async.c:164)
|
|
|
|
Fix freeing 'mon_host' also when qemu_rbd_connect() ends correctly.
|
|
|
|
Fixes: 0a55679b4a5061f4d74bdb1a0e81611ba3390b00
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Message-Id: <20210329150129.121182-2-sgarzare@redhat.com>
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/rbd.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/rbd.c b/block/rbd.c
|
|
index 9bd2bce71651b8612e37c5dc040d..15f1ac3b47d45e347a34579130ea 100644
|
|
--- a/block/rbd.c
|
|
+++ b/block/rbd.c
|
|
@@ -563,13 +563,13 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
r = -EINVAL;
|
|
- goto failed_opts;
|
|
+ goto out;
|
|
}
|
|
|
|
r = rados_create(cluster, opts->user);
|
|
if (r < 0) {
|
|
error_setg_errno(errp, -r, "error initializing");
|
|
- goto failed_opts;
|
|
+ goto out;
|
|
}
|
|
|
|
/* try default location when conf=NULL, but ignore failure */
|
|
@@ -626,11 +626,12 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
|
*/
|
|
rados_ioctx_set_namespace(*io_ctx, opts->q_namespace);
|
|
|
|
- return 0;
|
|
+ r = 0;
|
|
+ goto out;
|
|
|
|
failed_shutdown:
|
|
rados_shutdown(*cluster);
|
|
-failed_opts:
|
|
+out:
|
|
g_free(mon_host);
|
|
return r;
|
|
}
|