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

blockdev: Plug memory leak in drive_init()

bs_opts is leaked on all paths from its qdev_new() that don't got
through blockdev_init().  Add the missing QDECREF(), and zap bs_opts
after blockdev_init(), so the new QDECREF() does nothing when we go
through blockdev_init().

Leak introduced in commit f298d07.  Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 3cb0e25c4b417b7336816bd92de458f0770d49ff)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/blockdev.c b/blockdev.c
index 5dd01ea14..fbfdc2798 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -902,6 +902,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
 
     /* Actual block device init: Functionality shared with blockdev-add */
     dinfo = blockdev_init(filename, bs_opts, &local_err);
+    bs_opts = NULL;
     if (dinfo == NULL) {
         if (local_err) {
             qerror_report_err(local_err);
@@ -939,6 +940,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
 
 fail:
     qemu_opts_del(legacy_opts);
+    QDECREF(bs_opts);
     return dinfo;
 }