[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init() |
Date: |
Wed, 28 May 2014 11:17:02 +0200 |
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 <address@hidden>
---
blockdev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 6460c70..7ec7d79 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -941,6 +941,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);
@@ -978,6 +979,7 @@ DriveInfo *drive_init(QemuOpts *all_opts,
BlockInterfaceType block_default_type)
fail:
qemu_opts_del(legacy_opts);
+ QDECREF(bs_opts);
return dinfo;
}
--
1.9.3
- [Qemu-devel] [PATCH v2 01/14] qemu-img: Plug memory leak on block option help error path, (continued)
- [Qemu-devel] [PATCH v2 01/14] qemu-img: Plug memory leak on block option help error path, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_snapshot_create(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 04/14] block: Plug memory leak on brv_open_image() error path, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 11/14] block/vvfat: Plug memory leak in check_directory_consistency(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 10/14] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 12/14] block/vvfat: Plug memory leak in read_directory(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 05/14] qemu-io: Support multiple -o in open command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_init(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 07/14] qemu-io: Don't print NULL when open without non-option arg fails, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 14/14] qemu-img: Plug memory leak in convert command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 06/14] qemu-io: Plug memory leak in open command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 03/14] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Markus Armbruster, 2014/05/28
- Re: [Qemu-devel] [PATCH v2 00/14] block: Plug assorted memory leaks, Kevin Wolf, 2014/05/28