From 6b65120986e94f9f48ce92263b9660786038984b Mon Sep 17 00:00:00 2001 Message-Id: <6b65120986e94f9f48ce92263b9660786038984b.1418766606.git.jen@redhat.com> In-Reply-To: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> References: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> From: Fam Zheng Date: Thu, 4 Dec 2014 00:05:22 -0600 Subject: [CHANGE 28/31] vmdk: fix vmdk_parse_extents() extent_file leaks To: rhvirt-patches@redhat.com, jen@redhat.com RH-Author: Fam Zheng Message-id: <1417651524-18041-29-git-send-email-famz@redhat.com> Patchwork-id: 62701 O-Subject: [RHEL-7.1 qemu-kvm PATCH v5 28/30] vmdk: fix vmdk_parse_extents() extent_file leaks Bugzilla: 1002493 RH-Acked-by: Jeffrey Cody RH-Acked-by: Markus Armbruster RH-Acked-by: Max Reitz From: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi Reviewed-by: Max Reitz Reviewed-by: Fam Zheng (cherry picked from commit ff74f33c310892c90c4439d963a6ce67f47ce18c) Signed-off-by: Fam Zheng Signed-off-by: Jeff E. Nelson --- block/vmdk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index b9ab89b..ddd06f0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -835,6 +835,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, ret = vmdk_add_extent(bs, extent_file, true, sectors, 0, 0, 0, 0, 0, &extent, errp); if (ret < 0) { + bdrv_unref(extent_file); return ret; } extent->flat_start_offset = flat_offset << 9; @@ -854,6 +855,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, extent = &s->extents[s->num_extents - 1]; } else { error_setg(errp, "Unsupported extent type '%s'", type); + bdrv_unref(extent_file); return -ENOTSUP; } extent->type = g_strdup(type); -- 2.1.0