qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 04/29] block: Fix leak in bdrv_create_file_fallback()
Date: Fri,  6 Mar 2020 18:14:33 +0100	[thread overview]
Message-ID: <20200306171458.1848-5-kwolf@redhat.com> (raw)
In-Reply-To: <20200306171458.1848-1-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

@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 <mreitz@redhat.com>
Message-Id: <20200225155618.133412-1-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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



  parent reply	other threads:[~2020-03-06 17:21 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-06 17:14 [PULL 00/29] Block layer patches Kevin Wolf
2020-03-06 17:14 ` [PULL 01/29] qcow2: Fix alloc_cluster_abort() for pre-existing clusters Kevin Wolf
2020-03-06 17:14 ` [PULL 02/29] iotests/026: Test EIO on preallocated zero cluster Kevin Wolf
2020-03-06 17:14 ` [PULL 03/29] iotests/026: Test EIO on allocation in a data-file Kevin Wolf
2020-03-06 17:14 ` Kevin Wolf [this message]
2020-03-06 17:14 ` [PULL 05/29] block: Introduce 'bdrv_reopen_commit_post' step Kevin Wolf
2020-03-06 17:14 ` [PULL 06/29] block/qcow2: Move bitmap reopen into bdrv_reopen_commit_post Kevin Wolf
2020-03-06 17:14 ` [PULL 07/29] qemu-storage-daemon: Add barebone tool Kevin Wolf
2020-03-06 17:14 ` [PULL 08/29] stubs: Add arch_type Kevin Wolf
2020-03-06 17:14 ` [PULL 09/29] block: Move system emulator QMP commands to block/qapi-sysemu.c Kevin Wolf
2020-03-06 17:14 ` [PULL 10/29] block: Move common QMP commands to block-core QAPI module Kevin Wolf
2020-03-06 17:14 ` [PULL 11/29] block: Move sysemu QMP commands to QAPI block module Kevin Wolf
2020-03-06 17:14 ` [PULL 12/29] qemu-storage-daemon: Add --blockdev option Kevin Wolf
2020-03-06 17:14 ` [PULL 13/29] qapi: Flatten object-add Kevin Wolf
2020-07-08 15:48   ` Paolo Bonzini
2020-07-08 16:05     ` Kevin Wolf
2020-07-08 16:12       ` Paolo Bonzini
2020-07-09 10:26         ` Markus Armbruster
2020-03-06 17:14 ` [PULL 14/29] qemu-storage-daemon: Add --object option Kevin Wolf
2020-03-06 17:14 ` [PULL 15/29] qemu-storage-daemon: Add --nbd-server option Kevin Wolf
2020-03-06 17:14 ` [PULL 16/29] blockdev-nbd: Boxed argument type for nbd-server-add Kevin Wolf
2020-03-06 17:14 ` [PULL 17/29] qemu-storage-daemon: Add --export option Kevin Wolf
2020-03-06 17:14 ` [PULL 18/29] qemu-storage-daemon: Add main loop Kevin Wolf
2020-03-06 17:14 ` [PULL 19/29] qemu-storage-daemon: Add --chardev option Kevin Wolf
2020-03-06 17:14 ` [PULL 20/29] stubs: Update monitor stubs for qemu-storage-daemon Kevin Wolf
2020-03-06 17:14 ` [PULL 21/29] qapi: Create 'pragma' module Kevin Wolf
2020-03-06 17:14 ` [PULL 22/29] monitor: Create QAPIfied monitor_init() Kevin Wolf
2020-03-06 17:14 ` [PULL 23/29] qmp: Fail gracefully if chardev is already in use Kevin Wolf
2020-03-06 17:14 ` [PULL 24/29] hmp: " Kevin Wolf
2020-03-06 17:14 ` [PULL 25/29] monitor: Add allow_hmp parameter to monitor_init() Kevin Wolf
2020-03-06 17:14 ` [PULL 26/29] qemu-storage-daemon: Add --monitor option Kevin Wolf
2020-03-06 17:14 ` [PULL 27/29] block/rbd: Add support for ceph namespaces Kevin Wolf
2020-03-06 17:14 ` [PULL 28/29] iotests: Refactor blockdev-reopen test for iothreads Kevin Wolf
2020-03-06 17:14 ` [PULL 29/29] block: bdrv_reopen() with backing file in different AioContext Kevin Wolf
2020-03-06 19:16 ` [PULL 00/29] Block layer patches no-reply
2020-03-06 19:26 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200306171458.1848-5-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).