[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure |
Date: |
Sun, 9 Feb 2014 09:46:29 +0100 |
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
block/blkdebug.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 56c4cd0..8eb0db0 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -396,14 +396,14 @@ static int blkdebug_open(BlockDriverState *bs, QDict
*options, int flags,
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
ret = -EINVAL;
- goto fail;
+ goto out;
}
/* Read rules from config file or command line options */
config = qemu_opt_get(opts, "config");
ret = read_config(s, config, options, errp);
if (ret) {
- goto fail;
+ goto out;
}
/* Set initial state */
@@ -414,7 +414,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict
*options, int flags,
flags, true, false, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
- goto fail;
+ goto out;
}
/* Set request alignment */
@@ -424,11 +424,15 @@ static int blkdebug_open(BlockDriverState *bs, QDict
*options, int flags,
} else {
error_setg(errp, "Invalid alignment");
ret = -EINVAL;
- goto fail;
+ goto fail_unref;
}
ret = 0;
-fail:
+ goto out;
+
+fail_unref:
+ bdrv_unref(bs->file);
+out:
qemu_opts_del(opts);
return ret;
}
--
1.8.1.4
- [Qemu-devel] [PULL 08/18] block/iscsi: always fill bs->bl.opt_transfer_length, (continued)
- [Qemu-devel] [PULL 08/18] block/iscsi: always fill bs->bl.opt_transfer_length, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 09/18] qcow2: remove n_start and n_end of qcow2_alloc_cluster_offset(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 07/18] block: Fail gracefully with missing filename, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 10/18] qcow2: fix offset overflow in qcow2_alloc_clusters_at(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 12/18] qemu-iotests: add test for qcow2 preallocation with different cluster sizes, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 13/18] raw: Fix BlockLimits passthrough, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 14/18] block: Fix memory leaks in bdrv_co_do_pwritev(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 15/18] block: bdrv_aligned_pwritev: Assert overlap range, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative values, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure,
Kevin Wolf <=
- [Qemu-devel] [PULL 18/18] block: Fix 32 bit truncation in mark_request_serialising(), Kevin Wolf, 2014/02/09
- Re: [Qemu-devel] [PULL 00/18] Block patches, Peter Maydell, 2014/02/12