[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/23] qcow2: Fix memory leak in qcow2_update_options
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 15/23] qcow2: Fix memory leak in qcow2_update_options() error path |
Date: |
Fri, 11 Sep 2015 21:40:55 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index c61d996..374a56d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -597,8 +597,8 @@ static int qcow2_update_options(BlockDriverState *bs, QDict
*options,
const char *opt_overlap_check, *opt_overlap_check_template;
int overlap_check_template = 0;
uint64_t l2_cache_size, refcount_cache_size;
- Qcow2Cache *l2_table_cache;
- Qcow2Cache *refcount_block_cache;
+ Qcow2Cache *l2_table_cache = NULL;
+ Qcow2Cache *refcount_block_cache = NULL;
uint64_t cache_clean_interval;
bool use_lazy_refcounts;
int i;
@@ -735,6 +735,14 @@ static int qcow2_update_options(BlockDriverState *bs,
QDict *options,
ret = 0;
fail:
+ if (ret < 0) {
+ if (l2_table_cache) {
+ qcow2_cache_destroy(bs, l2_table_cache);
+ }
+ if (refcount_block_cache) {
+ qcow2_cache_destroy(bs, refcount_block_cache);
+ }
+ }
qemu_opts_del(opts);
opts = NULL;
--
1.8.3.1
- [Qemu-devel] [PULL 03/23] block: Drop drv parameter from bdrv_open_inherit(), (continued)
- [Qemu-devel] [PULL 03/23] block: Drop drv parameter from bdrv_open_inherit(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 01/23] block: Always pass NULL as drv for bdrv_open(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 04/23] block: Drop drv parameter from bdrv_fill_options(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 08/23] qemu-io: Remove duplicate 'open' error message, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 07/23] block: Allow specifying driver-specific options to reopen, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 09/23] qemu-io: Add command 'reopen', Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 10/23] qcow2: Improve error message, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 12/23] qcow2: Move qcow2_update_options() call up, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 11/23] qcow2: Factor out qcow2_update_options(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 06/23] qcow2: Rename BDRVQcowState to BDRVQcow2State, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 15/23] qcow2: Fix memory leak in qcow2_update_options() error path,
Kevin Wolf <=
- [Qemu-devel] [PULL 13/23] qcow2: Move rest of option handling to qcow2_update_options(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 14/23] qcow2: Leave s unchanged on qcow2_update_options() failure, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 22/23] vmdk: Fix next_cluster_sector for compressed write, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 23/23] qcow2: Make qcow2_alloc_bytes() more explicit, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 21/23] iotests: Add test for checking large image files, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 16/23] qcow2: Make qcow2_update_options() suitable for transactions, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 18/23] qemu-iotests: Reopen qcow2 with lazy-refcounts change, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 17/23] qcow2: Support updating driver-specific options in reopen, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 20/23] qcow2: Make size_to_clusters() return uint64_t, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 19/23] qemu-iotests: More qcow2 reopen tests, Kevin Wolf, 2015/09/11