From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47980)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1XMqwc-0002rF-9j
	for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:04:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1XMqwW-0005x6-5A
	for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:04:18 -0400
Received: from mx1.redhat.com ([209.132.183.28]:12371)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1XMqwV-0005wu-Ou
	for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:04:12 -0400
Date: Thu, 28 Aug 2014 12:04:22 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20140828040422.GD15156@T430.redhat.com>
References: <1409119356-22742-1-git-send-email-famz@redhat.com>
	<1409119356-22742-5-git-send-email-famz@redhat.com>
	<20140827144036.GI31176@irqsave.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <20140827144036.GI31176@irqsave.net>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 4/4] qcow2: Fix leak of opts 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: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

On Wed, 08/27 16:40, Beno=EEt Canet wrote:
> The Wednesday 27 Aug 2014 =E0 14:02:36 (+0800), Fam Zheng wrote :
> > Not all the error paths release opts, fix it by moving it after the f=
ail
> > label.
> >=20
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  block/qcow2.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >=20
> > diff --git a/block/qcow2.c b/block/qcow2.c
> > index f9e045f..b4c4a6e 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 follo=
wing: "
> >                     "none, constant, cached, all", opt_overlap_check)=
;
> > -        qemu_opts_del(opts);
> >          ret =3D -EINVAL;
> >          goto fail;
> >      }
> > @@ -946,7 +945,6 @@ static int qcow2_open(BlockDriverState *bs, QDict=
 *options, int flags,
> >                                overlap_check_template & (1 << i)) << =
i;
> >      }
> > =20
> > -    qemu_opts_del(opts);
> > =20
> >      if (s->use_lazy_refcounts && s->qcow_version < 3) {
> >          error_setg(errp, "Lazy refcounts require a qcow2 image with =
at least "
> > @@ -964,6 +962,7 @@ static int qcow2_open(BlockDriverState *bs, QDict=
 *options, int flags,
>=20
>=20
> >      return ret;
> The code is returning here in this case and the qemu_opts_del is hidden=
 in the fail label.
> Do we need to qemu_opts_del on success just before return like it was d=
one before ?

Yes, good catch.

Thanks,
Fam

>=20
> > =20
> >   fail:
> > +    qemu_opts_del(opts);
> >      g_free(s->unknown_header_fields);
> >      cleanup_unknown_header_ext(bs);
> >      qcow2_free_snapshots(bs);
> > --=20
> > 2.1.0
> >=20
> >=20