From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5TZU-0003wW-BO for qemu-devel@nongnu.org; Sun, 18 Sep 2011 22:27:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5TZT-0000mG-Ds for qemu-devel@nongnu.org; Sun, 18 Sep 2011 22:27:00 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:35559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5TZT-0000mC-BU for qemu-devel@nongnu.org; Sun, 18 Sep 2011 22:26:59 -0400 Received: by gye5 with SMTP id 5so4719906gye.4 for ; Sun, 18 Sep 2011 19:26:58 -0700 (PDT) From: Fam Zheng Date: Mon, 19 Sep 2011 10:26:42 +0800 Message-Id: <1316399202-28429-1-git-send-email-famcool@gmail.com> Subject: [Qemu-devel] [PATCH] VMDK: fix leak of extent_file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Release extent_file on error in vmdk_parse_extents. Added closing files in freeing extents. Signed-off-by: Fam Zheng --- block/vmdk.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 6c8edfc..5d16ec4 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -179,11 +179,16 @@ static void vmdk_free_extents(BlockDriverState *bs) { int i; BDRVVmdkState *s = bs->opaque; + VmdkExtent *e; for (i = 0; i < s->num_extents; i++) { - g_free(s->extents[i].l1_table); - g_free(s->extents[i].l2_cache); - g_free(s->extents[i].l1_backup_table); + e = &s->extents[i]; + g_free(e->l1_table); + g_free(e->l2_cache); + g_free(e->l1_backup_table); + if (e->file != bs->file) { + bdrv_delete(e->file); + } } g_free(s->extents); } @@ -619,12 +624,13 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, s->desc_offset = 0; ret = vmdk_parse_extents(buf, bs, bs->file->filename); if (ret) { + vmdk_free_extents(bs); return ret; } /* try to open parent images, if exist */ if (vmdk_parent_open(bs)) { - g_free(s->extents); + vmdk_free_extents(bs); return -EINVAL; } s->parent_cid = vmdk_read_cid(bs, 1);