[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/29] block: Fix leak in bdrv_create_file_fallback()
From: |
Kevin Wolf |
Subject: |
[PULL 04/29] block: Fix leak in bdrv_create_file_fallback() |
Date: |
Fri, 6 Mar 2020 18:14:33 +0100 |
From: Max Reitz <address@hidden>
@options is leaked by the first two return statements in this function.
Note that blk_new_open() takes the reference to @options even on
failure, so all we need to do to fix the leak is to move the QDict
allocation down to where we actually need it.
Reported-by: Coverity (CID 1419884)
Fixes: fd17146cd93d1704cd96d7c2757b325fc7aac6fd
("block: Generic file creation fallback")
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 1bdb9c679d..876bd45182 100644
--- a/block.c
+++ b/block.c
@@ -600,7 +600,7 @@ static int bdrv_create_file_fallback(const char *filename,
BlockDriver *drv,
QemuOpts *opts, Error **errp)
{
BlockBackend *blk;
- QDict *options = qdict_new();
+ QDict *options;
int64_t size = 0;
char *buf = NULL;
PreallocMode prealloc;
@@ -623,6 +623,7 @@ static int bdrv_create_file_fallback(const char *filename,
BlockDriver *drv,
return -ENOTSUP;
}
+ options = qdict_new();
qdict_put_str(options, "driver", drv->format_name);
blk = blk_new_open(filename, NULL, options,
--
2.20.1
- [PULL 00/29] Block layer patches, Kevin Wolf, 2020/03/06
- [PULL 02/29] iotests/026: Test EIO on preallocated zero cluster, Kevin Wolf, 2020/03/06
- [PULL 05/29] block: Introduce 'bdrv_reopen_commit_post' step, Kevin Wolf, 2020/03/06
- [PULL 04/29] block: Fix leak in bdrv_create_file_fallback(),
Kevin Wolf <=
- [PULL 03/29] iotests/026: Test EIO on allocation in a data-file, Kevin Wolf, 2020/03/06
- [PULL 01/29] qcow2: Fix alloc_cluster_abort() for pre-existing clusters, Kevin Wolf, 2020/03/06
- [PULL 07/29] qemu-storage-daemon: Add barebone tool, Kevin Wolf, 2020/03/06
- [PULL 08/29] stubs: Add arch_type, Kevin Wolf, 2020/03/06
- [PULL 14/29] qemu-storage-daemon: Add --object option, Kevin Wolf, 2020/03/06
- [PULL 06/29] block/qcow2: Move bitmap reopen into bdrv_reopen_commit_post, Kevin Wolf, 2020/03/06
- [PULL 16/29] blockdev-nbd: Boxed argument type for nbd-server-add, Kevin Wolf, 2020/03/06
- [PULL 13/29] qapi: Flatten object-add, Kevin Wolf, 2020/03/06
- [PULL 15/29] qemu-storage-daemon: Add --nbd-server option, Kevin Wolf, 2020/03/06
- [PULL 19/29] qemu-storage-daemon: Add --chardev option, Kevin Wolf, 2020/03/06