[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/17] blockdev: Plug memory leak in drive_init()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 09/17] blockdev: Plug memory leak in drive_init() |
Date: |
Mon, 2 Jun 2014 15:56:40 +0200 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 652a052..9b5261b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -940,6 +940,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) {
error_report("%s", error_get_pretty(local_err));
@@ -977,6 +978,7 @@ DriveInfo *drive_init(QemuOpts *all_opts,
BlockInterfaceType block_default_type)
fail:
qemu_opts_del(legacy_opts);
+ QDECREF(bs_opts);
return dinfo;
}
--
1.8.3.1
- [Qemu-devel] [PULL 01/17] qemu-img: Plug memory leak on block option help error path, (continued)
- [Qemu-devel] [PULL 01/17] qemu-img: Plug memory leak on block option help error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 02/17] block/vvfat: Plug memory leak in enable_write_target(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 03/17] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 04/17] block: Plug memory leak on brv_open_image() error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 05/17] qemu-io: Support multiple -o in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 06/17] qemu-io: Plug memory leak in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 08/17] blockdev: Plug memory leak in blockdev_init(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 07/17] qemu-io: Don't print NULL when open without non-option arg fails, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 10/17] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 11/17] block/vvfat: Plug memory leak in check_directory_consistency(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 09/17] blockdev: Plug memory leak in drive_init(),
Kevin Wolf <=
- [Qemu-devel] [PULL 12/17] block/vvfat: Plug memory leak in read_directory(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 13/17] block/sheepdog: Plug memory leak in sd_snapshot_create(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 14/17] qemu-img: Plug memory leak in convert command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 15/17] block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 16/17] vmdk: Fix local_err in vmdk_create, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 17/17] qemu-img: Report error even with --oformat=json, Kevin Wolf, 2014/06/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2014/06/02