From d1775fe94a1bbfb337c7e6d178a81de3c5339d3f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 28 May 2014 11:17:02 +0200 Subject: [PATCH] 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 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 31b66ccb89..4d911f9600 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; }