From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z7E-0005E8-G4 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z6L-000120-MG for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:23:40 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:52075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z6L-00011O-Df for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:22:45 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 11:22:45 -0600 From: Michael Roth Date: Tue, 8 Jul 2014 12:18:36 -0500 Message-Id: <1404839947-1086-126-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 125/156] blockdev: Plug memory leak in drive_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Markus Armbruster 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 Signed-off-by: Kevin Wolf (cherry picked from commit 3cb0e25c4b417b7336816bd92de458f0770d49ff) Conflicts: blockdev.c *fixed trivial context mismatch due to blockdev_init signature change Signed-off-by: Michael Roth --- blockdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blockdev.c b/blockdev.c index 31b66cc..4d911f9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -868,6 +868,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) /* Actual block device init: Functionality shared with blockdev-add */ dinfo = blockdev_init(bs_opts, type, &local_err); + bs_opts = NULL; if (dinfo == NULL) { if (error_is_set(&local_err)) { qerror_report_err(local_err); @@ -904,6 +905,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) fail: qemu_opts_del(legacy_opts); + QDECREF(bs_opts); return dinfo; } -- 1.9.1