From patchwork Tue Feb 8 14:12:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [master+0.14, 2/2] blockdev: Plug memory leak in drive_init() error paths From: Markus Armbruster X-Patchwork-Id: 82346 Message-Id: <1297174359-31888-3-git-send-email-armbru@redhat.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jmforbes@linuxtx.org Date: Tue, 8 Feb 2011 15:12:39 +0100 Should have spotted this when doing commit 319ae529. Signed-off-by: Markus Armbruster --- blockdev.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 24d7658..0690cc8 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)