From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKAAn-0005SZ-BO for qemu-devel@nongnu.org; Wed, 20 Aug 2014 13:59:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKAAh-0007gO-6p for qemu-devel@nongnu.org; Wed, 20 Aug 2014 13:59:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKAAg-0007gE-UE for qemu-devel@nongnu.org; Wed, 20 Aug 2014 13:59:43 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7KHxgHg015775 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 20 Aug 2014 13:59:42 -0400 From: Max Reitz Date: Wed, 20 Aug 2014 19:59:33 +0200 Message-Id: <1408557576-14574-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1408557576-14574-1-git-send-email-mreitz@redhat.com> References: <1408557576-14574-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] qcow2: Fix leak of QemuOpts in qcow2_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Currently, the QemuOpts object opts is leaked if anything fails from its creation up to and including the image repair block. Fix this by freeing that object in the fail path. Signed-off-by: Max Reitz --- block/qcow2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index f9e045f..c64d611 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -535,7 +535,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, unsigned int len, i; int ret = 0; QCowHeader header; - QemuOpts *opts; + QemuOpts *opts = NULL; Error *local_err = NULL; uint64_t ext_end; uint64_t l1_vm_state_index; @@ -932,7 +932,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, error_setg(errp, "Unsupported value '%s' for qcow2 option " "'overlap-check'. Allowed are either of the following: " "none, constant, cached, all", opt_overlap_check); - qemu_opts_del(opts); ret = -EINVAL; goto fail; } @@ -947,6 +946,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, } qemu_opts_del(opts); + opts = NULL; if (s->use_lazy_refcounts && s->qcow_version < 3) { error_setg(errp, "Lazy refcounts require a qcow2 image with at least " @@ -964,6 +964,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, return ret; fail: + qemu_opts_del(opts); g_free(s->unknown_header_fields); cleanup_unknown_header_ext(bs); qcow2_free_snapshots(bs); -- 2.0.4