qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	Fam Zheng <famz@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 05/11] block: fix vvfat error path for enable_write_target
Date: Fri, 19 Jul 2013 16:38:46 +0800	[thread overview]
Message-ID: <1374223132-29107-6-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1374223132-29107-1-git-send-email-stefanha@redhat.com>

From: Fam Zheng <famz@redhat.com>

s->qcow and s->qcow_filename are allocated but not freed on error. Fix the
possible leaks, remove unnecessary check for bdrv_new(), propagate ret code of
bdrv_create() and also the one of enable_write_target().

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vvfat.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index 87b0279..cd3b8ed 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1164,8 +1164,8 @@ DLOG(if (stderr == NULL) {
     s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
 
     if (qemu_opt_get_bool(opts, "rw", false)) {
-        if (enable_write_target(s)) {
-            ret = -EIO;
+        ret = enable_write_target(s);
+        if (ret < 0) {
             goto fail;
         }
         bs->read_only = 0;
@@ -2917,9 +2917,7 @@ static int enable_write_target(BDRVVVFATState *s)
     s->qcow_filename = g_malloc(1024);
     ret = get_tmp_filename(s->qcow_filename, 1024);
     if (ret < 0) {
-        g_free(s->qcow_filename);
-        s->qcow_filename = NULL;
-        return ret;
+        goto err;
     }
 
     bdrv_qcow = bdrv_find_format("qcow");
@@ -2927,18 +2925,18 @@ static int enable_write_target(BDRVVVFATState *s)
     set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512);
     set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:");
 
-    if (bdrv_create(bdrv_qcow, s->qcow_filename, options) < 0)
-	return -1;
+    ret = bdrv_create(bdrv_qcow, s->qcow_filename, options);
+    if (ret < 0) {
+        goto err;
+    }
 
     s->qcow = bdrv_new("");
-    if (s->qcow == NULL) {
-        return -1;
-    }
 
     ret = bdrv_open(s->qcow, s->qcow_filename, NULL,
             BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, bdrv_qcow);
     if (ret < 0) {
-	return ret;
+        bdrv_delete(s->qcow);
+        goto err;
     }
 
 #ifndef _WIN32
@@ -2951,6 +2949,11 @@ static int enable_write_target(BDRVVVFATState *s)
     *(void**)s->bs->backing_hd->opaque = s;
 
     return 0;
+
+err:
+    g_free(s->qcow_filename);
+    s->qcow_filename = NULL;
+    return ret;
 }
 
 static void vvfat_close(BlockDriverState *bs)
-- 
1.8.1.4

  parent reply	other threads:[~2013-07-19  8:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  8:38 [Qemu-devel] [PULL for-1.6 00/11] Block patches Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 01/11] gluster: Use pkg-config to configure GlusterFS block driver Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 02/11] gluster: Add discard support for " Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 03/11] dataplane: sync virtio.c and vring.c virtqueue state Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 04/11] QEMUBH: make AioContext's bh re-entrant Stefan Hajnoczi
2013-07-19  8:38 ` Stefan Hajnoczi [this message]
2013-07-19  8:38 ` [Qemu-devel] [PATCH 06/11] block: add bdrv_write_zeroes() Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 07/11] block/raw: add bdrv_co_write_zeroes Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 08/11] block-migration: efficiently encode zero blocks Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 09/11] cpus: Let vm_stop[_force_state]() always flush block devices Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 10/11] block: fix bdrv_read_unthrottled() Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 11/11] block/raw: add .bdrv_get_info Stefan Hajnoczi

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=1374223132-29107-6-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=famz@redhat.com \
    --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).