qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, armbru@redhat.com
Subject: [PULL 02/15] qemu-config: fix memory leak on ferror()
Date: Thu, 22 Jul 2021 17:35:59 +0200	[thread overview]
Message-ID: <20210722153612.955537-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com>

The leak is basically impossible to reach, since the only common way
to get ferror(fp) is by passing a directory to -readconfig.  In that
case, the error occurs before qdict is set to anything non-NULL.
However, it's theoretically possible to get there after an EIO.

Cc: armbru@redhat.com
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: f7544edcd3 ("qemu-config: add error propagation to qemu_config_parse", 2021-03-06)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 util/qemu-config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 7db810f1e0..fdf6cd69fc 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -414,7 +414,7 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque,
     if (ferror(fp)) {
         loc_pop(&loc);
         error_setg_errno(errp, errno, "Cannot read config file");
-        return res;
+        goto out_no_loc;
     }
     res = count;
     if (qdict) {
@@ -422,6 +422,7 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque,
     }
 out:
     loc_pop(&loc);
+out_no_loc:
     qobject_unref(qdict);
     return res;
 }
-- 
2.31.1




  parent reply	other threads:[~2021-07-22 15:40 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-22 15:35 [PULL 00/15] Misc bugfix patches for 2021-07-22 Paolo Bonzini
2021-07-22 15:35 ` [PULL 01/15] qemu-config: never call the callback after an error, fix leak Paolo Bonzini
2021-07-22 15:35 ` Paolo Bonzini [this message]
2021-07-22 15:36 ` [PULL 03/15] vl: Parse legacy default_machine_opts Paolo Bonzini
2021-07-22 15:36 ` [PULL 04/15] chardev-spice: add missing module_obj directive Paolo Bonzini
2021-07-22 17:41   ` Philippe Mathieu-Daudé
2021-07-22 15:36 ` [PULL 05/15] usb: fix usb-host dependency check Paolo Bonzini
2021-07-22 15:36 ` [PULL 06/15] qemu-config: restore "machine" in qmp_query_command_line_options() Paolo Bonzini
2021-07-22 15:36 ` [PULL 07/15] target/i386: Added V_INTR_PRIO check to virtual interrupts Paolo Bonzini
2021-07-22 15:36 ` [PULL 08/15] target/i386: Added consistency checks for CR4 Paolo Bonzini
2021-08-31 17:03   ` Richard W.M. Jones
2021-08-31 17:12     ` Daniel P. Berrangé
2021-08-31 17:35     ` Daniel P. Berrangé
2021-07-22 15:36 ` [PULL 09/15] target/i386: Added consistency checks for EFER Paolo Bonzini
2021-07-22 15:36 ` [PULL 10/15] configure: Drop obsolete check for the alloc_size attribute Paolo Bonzini
2021-07-22 15:36 ` [PULL 11/15] meson: fix dependencies for modinfo Paolo Bonzini
2021-07-22 15:36 ` [PULL 12/15] configure: Fix --without-default-features propagation to meson Paolo Bonzini
2021-07-22 15:36 ` [PULL 13/15] configure: Allow vnc to get disabled with --without-default-features Paolo Bonzini
2021-07-22 15:36 ` [PULL 14/15] configure: Fix the default setting of the "xen" feature Paolo Bonzini
2021-07-22 15:36 ` [PULL 15/15] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa Paolo Bonzini
2021-07-23 10:15 ` [PULL 00/15] Misc bugfix patches for 2021-07-22 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=20210722153612.955537-3-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=armbru@redhat.com \
    --cc=peter.maydell@linaro.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).