From 2753d4a5fa44d980cc6a279f323a12ca8d172972 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 8 Feb 2011 15:12:38 +0100 Subject: blockdev: Plug memory leak in drive_uninit() Started leaking in commit 1dae12e6. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 1 + 1 file changed, 1 insertion(+) (limited to 'blockdev.c') diff --git a/blockdev.c b/blockdev.c index ecfadc138f..24d765806b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -182,6 +182,7 @@ static void drive_uninit(DriveInfo *dinfo) { qemu_opts_del(dinfo->opts); bdrv_delete(dinfo->bdrv); + qemu_free(dinfo->id); QTAILQ_REMOVE(&drives, dinfo, next); qemu_free(dinfo); } -- cgit 1.4.1 From a9ae2bffea62ce5158be7475fe41e5fba6d026c1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 8 Feb 2011 15:12:39 +0100 Subject: blockdev: Plug memory leak in drive_init() error paths Should have spotted this when doing commit 319ae529. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'blockdev.c') diff --git a/blockdev.c b/blockdev.c index 24d765806b..0690cc8bea 100644 --- a/blockdev.c +++ b/blockdev.c @@ -526,7 +526,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) } else if (ro == 1) { if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) { error_report("readonly not supported by this bus type"); - return NULL; + goto err; } } @@ -536,12 +536,19 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) if (ret < 0) { error_report("could not open disk image %s: %s", file, strerror(-ret)); - return NULL; + goto err; } if (bdrv_key_required(dinfo->bdrv)) autostart = 0; return dinfo; + +err: + bdrv_delete(dinfo->bdrv); + qemu_free(dinfo->id); + QTAILQ_REMOVE(&drives, dinfo, next); + qemu_free(dinfo); + return NULL; } void do_commit(Monitor *mon, const QDict *qdict) -- cgit 1.4.1