From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57169)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XKWZd-0002CY-G3
	for qemu-devel@nongnu.org; Thu, 21 Aug 2014 13:55:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XKWZY-0004hI-BK
	for qemu-devel@nongnu.org; Thu, 21 Aug 2014 13:54:57 -0400
Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:59774 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XKWZY-0004h0-3v
	for qemu-devel@nongnu.org; Thu, 21 Aug 2014 13:54:52 -0400
Date: Thu, 21 Aug 2014 19:54:04 +0200
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140821175403.GD26320@irqsave.net>
References: <1408557576-14574-1-git-send-email-mreitz@redhat.com>
	<1408557576-14574-2-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1408557576-14574-2-git-send-email-mreitz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 1/4] qcow2: Fix leak of QemuOpts in
 qcow2_open()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

The Wednesday 20 Aug 2014 =E0 19:59:33 (+0200), Max Reitz wrote :
> Currently, the QemuOpts object opts is leaked if anything fails from it=
s
> creation up to and including the image repair block. Fix this by freein=
g
> that object in the fail path.
>=20
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/qcow2.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>=20
> 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 =3D 0;
>      QCowHeader header;
> -    QemuOpts *opts;
> +    QemuOpts *opts =3D NULL;
>      Error *local_err =3D 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 followi=
ng: "
>                     "none, constant, cached, all", opt_overlap_check);
> -        qemu_opts_del(opts);
>          ret =3D -EINVAL;
>          goto fail;
>      }
> @@ -947,6 +946,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *=
options, int flags,
>      }
> =20
>      qemu_opts_del(opts);
> +    opts =3D NULL;
> =20
>      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;
> =20
>   fail:
> +    qemu_opts_del(opts);
>      g_free(s->unknown_header_fields);
>      cleanup_unknown_header_ext(bs);
>      qcow2_free_snapshots(bs);
> --=20
> 2.0.4
>=20
>=20
Reviewed-by: Beno=EEt Canet <benoit.canet@nodalink.com>