218e99
From 631c132d062d057d4648c88e5dfa4b8a375d3442 Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Mon, 4 Nov 2013 22:31:56 +0100
218e99
Subject: [PATCH 03/87] block: fix vvfat error path for enable_write_target
218e99
218e99
RH-Author: Max Reitz <mreitz@redhat.com>
218e99
Message-id: <1383604354-12743-6-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 55305
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 05/43] block: fix vvfat error path for enable_write_target
218e99
Bugzilla: 1026524
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
218e99
From: Fam Zheng <famz@redhat.com>
218e99
218e99
BZ: 1026524
218e99
218e99
s->qcow and s->qcow_filename are allocated but not freed on error. Fix the
218e99
possible leaks, remove unnecessary check for bdrv_new(), propagate ret code of
218e99
bdrv_create() and also the one of enable_write_target().
218e99
218e99
Signed-off-by: Fam Zheng <famz@redhat.com>
218e99
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
218e99
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
(cherry picked from commit 78f27bd02ceba4a2f6ac5c725f4d4410eec205ef)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 block/vvfat.c | 25 ++++++++++++++-----------
218e99
 1 file changed, 14 insertions(+), 11 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/vvfat.c |   25 ++++++++++++++-----------
218e99
 1 files changed, 14 insertions(+), 11 deletions(-)
218e99
218e99
diff --git a/block/vvfat.c b/block/vvfat.c
218e99
index 415fba3..dd0efca 100644
218e99
--- a/block/vvfat.c
218e99
+++ b/block/vvfat.c
218e99
@@ -1164,8 +1164,8 @@ DLOG(if (stderr == NULL) {
218e99
     s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
218e99
 
218e99
     if (qemu_opt_get_bool(opts, "rw", false)) {
218e99
-        if (enable_write_target(s)) {
218e99
-            ret = -EIO;
218e99
+        ret = enable_write_target(s);
218e99
+        if (ret < 0) {
218e99
             goto fail;
218e99
         }
218e99
         bs->read_only = 0;
218e99
@@ -2918,9 +2918,7 @@ static int enable_write_target(BDRVVVFATState *s)
218e99
     s->qcow_filename = g_malloc(1024);
218e99
     ret = get_tmp_filename(s->qcow_filename, 1024);
218e99
     if (ret < 0) {
218e99
-        g_free(s->qcow_filename);
218e99
-        s->qcow_filename = NULL;
218e99
-        return ret;
218e99
+        goto err;
218e99
     }
218e99
 
218e99
     bdrv_qcow = bdrv_find_format("qcow");
218e99
@@ -2928,18 +2926,18 @@ static int enable_write_target(BDRVVVFATState *s)
218e99
     set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512);
218e99
     set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:");
218e99
 
218e99
-    if (bdrv_create(bdrv_qcow, s->qcow_filename, options) < 0)
218e99
-	return -1;
218e99
+    ret = bdrv_create(bdrv_qcow, s->qcow_filename, options);
218e99
+    if (ret < 0) {
218e99
+        goto err;
218e99
+    }
218e99
 
218e99
     s->qcow = bdrv_new("");
218e99
-    if (s->qcow == NULL) {
218e99
-        return -1;
218e99
-    }
218e99
 
218e99
     ret = bdrv_open(s->qcow, s->qcow_filename, NULL,
218e99
             BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, bdrv_qcow);
218e99
     if (ret < 0) {
218e99
-	return ret;
218e99
+        bdrv_delete(s->qcow);
218e99
+        goto err;
218e99
     }
218e99
 
218e99
 #ifndef _WIN32
218e99
@@ -2952,6 +2950,11 @@ static int enable_write_target(BDRVVVFATState *s)
218e99
     *(void**)s->bs->backing_hd->opaque = s;
218e99
 
218e99
     return 0;
218e99
+
218e99
+err:
218e99
+    g_free(s->qcow_filename);
218e99
+    s->qcow_filename = NULL;
218e99
+    return ret;
218e99
 }
218e99
 
218e99
 static void vvfat_close(BlockDriverState *bs)
218e99
-- 
218e99
1.7.1
218e99