aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2020-03-20 13:36:20 -0500
committerMichael Roth <mdroth@linux.vnet.ibm.com>2020-06-22 12:52:01 -0500
commit47e0fa74799c23dc29ff0adb356d82425b166231 (patch)
tree3629b2fa4c092fcbb16cce83a790c58359f0f95b
parent745859d5bf33f5ff80f00499c822079d9335d3ed (diff)
downloadqemu-47e0fa74799c23dc29ff0adb356d82425b166231.zip
qemu-47e0fa74799c23dc29ff0adb356d82425b166231.tar.gz
qemu-47e0fa74799c23dc29ff0adb356d82425b166231.tar.bz2
block: Avoid memleak on qcow2 image info failure
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> (cherry picked from commit 71eaec2e8c7c8d266137b5c5f42da0bd6d6b5eb7) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--block/qcow2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index 7c18721..13e118e 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){