22b3f26e04
- Include upstream patches targeted for the next stable release (bug fixes only) block-Avoid-memleak-on-qcow2-image-info-.patch block-bdrv_set_backing_bs-fix-use-after-.patch hmp-vnc-Fix-info-vnc-list-leak.patch migration-colo-fix-use-after-free-of-loc.patch migration-ram-fix-use-after-free-of-loca.patch ppc-ppc405_boards-Remove-unnecessary-NUL.patch qcow2-List-autoclear-bit-names-in-header.patch scsi-qemu-pr-helper-Fix-out-of-bounds-ac.patch sheepdog-Consistently-set-bdrv_has_zero_.patch OBS-URL: https://build.opensuse.org/request/show/788690 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=541
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From: Eric Blake <eblake@redhat.com>
|
|
Date: Fri, 20 Mar 2020 13:36:20 -0500
|
|
Subject: block: Avoid memleak on qcow2 image info failure
|
|
|
|
Git-commit: 71eaec2e8c7c8d266137b5c5f42da0bd6d6b5eb7
|
|
|
|
If we fail to get bitmap info, we must not leak the encryption info.
|
|
|
|
Fixes: b8968c875f403
|
|
Fixes: Coverity CID 1421894
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Message-Id: <20200320183620.1112123-1-eblake@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
|
|
Tested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/qcow2.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
index 7c18721741eacfb7f6c2c1f0efe6..13e118e16f02f371c0f23c7aaa8d 100644
|
|
--- a/block/qcow2.c
|
|
+++ b/block/qcow2.c
|
|
@@ -4800,6 +4800,7 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs,
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
qapi_free_ImageInfoSpecific(spec_info);
|
|
+ qapi_free_QCryptoBlockInfo(encrypt_info);
|
|
return NULL;
|
|
}
|
|
*spec_info->u.qcow2.data = (ImageInfoSpecificQCow2){
|