From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 28 May 2014 09:17:01 +0000 (+0200)
Subject: blockdev: Plug memory leak in blockdev_init()
X-Git-Tag: qemu-xen-4.5.0-rc1^2~59
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5a0913f782a5d73a274b1fb39ec7d4d9a79ad4ca;p=qemu-upstream-4.5-testing.git

blockdev: Plug memory leak in blockdev_init()

blockdev_init() leaks bs_opts when qemu_opts_create() fails, i.e. when
the ID is bad.  Missed in commit ec9c10d.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 6376f9522372d589f3efe60001dc0486237dd375)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/blockdev.c b/blockdev.c
index fbfdc2798..b0ce4f0bf 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -332,7 +332,7 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
     opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
     if (error) {
         error_propagate(errp, error);
-        return NULL;
+        goto err_no_opts;
     }
 
     qemu_opts_absorb_qdict(opts, bs_opts, &error);
@@ -527,8 +527,9 @@ err:
     QTAILQ_REMOVE(&drives, dinfo, next);
     g_free(dinfo);
 early_err:
-    QDECREF(bs_opts);
     qemu_opts_del(opts);
+err_no_opts:
+    QDECREF(bs_opts);
     return NULL;
 }