Skip to contentSkip to conversation

qcow2: fix two memory leaks in qcow2_open error code path

PATCH Applied Prasad Joshi 3 participants 3 messages Mar 28, 2014 – Mar 31, 2014 Block layer

lore
Share & tools
lore

Prasad Joshi

author
#0 lore raw

PATCH 1/1 qcow2: fix two memory leaks in qcow2_open error code path

Signed-off-by Prasad Joshi <[email protected]>
---
 block/qcow2.c | 4 ++++
 1 file changed, 4 insertions(+)
block/qcow2.c +4 -0
index b9dc960..10eccf9 100644
@@ -506,6 +506,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
                                    s->incompatible_features &
                                    ~QCOW2_INCOMPAT_MASK);
         ret = -ENOTSUP;
+        g_free(feature_table);
         goto fail;
     }
 

@@ -745,6 +746,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
     if (s->l2_table_cache) {
         qcow2_cache_destroy(bs, s->l2_table_cache);
     }
+    if (s->refcount_block_cache) {
+        qcow2_cache_destroy(bs, s->refcount_block_cache);
+    }
     g_free(s->cluster_cache);
     qemu_vfree(s->cluster_data);
     return ret;
Signature · 1 line
1.8.1.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>
---
  block/qcow2.c | 4 ++++
  1 file changed, 4 insertions(+)
block/qcow2.c +1 -0
index b9dc960..10eccf9 100644
@@ -506,6 +506,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
                                     s->incompatible_features &
                                     ~QCOW2_INCOMPAT_MASK);
          ret = -ENOTSUP;
+        g_free(feature_table);
          goto fail;
      }

block/qcow2.c static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, · line 754

Quoted 9 lines
block/qcow2.c +3 -0
@@ -745,6 +746,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
      if (s->l2_table_cache) {
          qcow2_cache_destroy(bs, s->l2_table_cache);
      }
+    if (s->refcount_block_cache) {
+        qcow2_cache_destroy(bs, s->refcount_block_cache);
+    }
      g_free(s->cluster_cache);
      qemu_vfree(s->cluster_data);
      return ret;
Reviewed-by Max Reitz <[email protected]>