Patchwork VMDK: fix leak of extent_file

login
register
mail settings
Submitter Feiran Zheng
Date Sept. 19, 2011, 2:26 a.m.
Message ID <1316399202-28429-1-git-send-email-famcool@gmail.com>
Download mbox | patch
Permalink /patch/115285/
State New
Headers show

Comments

Feiran Zheng - Sept. 19, 2011, 2:26 a.m.
Release extent_file on error in vmdk_parse_extents. Added closing files
in freeing extents.

Signed-off-by: Fam Zheng <famcool@gmail.com>
---
 block/vmdk.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
Kevin Wolf - Sept. 19, 2011, 10:22 a.m.
Am 19.09.2011 04:26, schrieb Fam Zheng:
> Release extent_file on error in vmdk_parse_extents. Added closing files
> in freeing extents.
> 
> Signed-off-by: Fam Zheng <famcool@gmail.com>

Thanks, applied to the block branch.

Kevin

Patch

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);