Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 13 Nov 2019 18:37:10 -0200
From:   Arnaldo Carvalho de Melo <acme@redhat.com>
To:     Steven Rostedt <rostedt@goodmis.org>
Cc:     Hewenliang <hewenliang4@huawei.com>, tstoyanov@vmware.com,
        namhyung@kernel.org, linux-kernel@vger.kernel.org,
        linfeilong@huawei.com
Subject: Re: [PATCH] tools lib traceevent: Fix memory leakage in
 copy_filter_type
Message-ID: <20191113203710.GC3078@redhat.com>
References: <20191025082312.62690-1-hewenliang4@huawei.com>
 <20191113144626.44ad5418@gandalf.local.home>
MIME-Version: 1.0
In-Reply-To: <20191113144626.44ad5418@gandalf.local.home>
User-Agent: Mutt/1.5.20 (2009-12-10)
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Em Wed, Nov 13, 2019 at 02:46:26PM -0500, Steven Rostedt escreveu:
> On Fri, 25 Oct 2019 04:23:12 -0400
> Hewenliang <hewenliang4@huawei.com> wrote:
>=20
> > It is necessary to free the memory that we have allocated
> > when error occurs.
> >=20
> > Fixes: ef3072cd1d5c ("tools lib traceevent: Get rid of die in add_filte=
r_type()")
> > Signed-off-by: Hewenliang <hewenliang4@huawei.com>
>=20
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
>=20
> Arnaldo,

sure
=20
> Can you take this?
>=20
> -- Steve
>=20
> > ---
> >  tools/lib/traceevent/parse-filter.c | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> >=20
> > diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent=
/parse-filter.c
> > index 552592d153fb..fbaa790d10d8 100644
> > --- a/tools/lib/traceevent/parse-filter.c
> > +++ b/tools/lib/traceevent/parse-filter.c
> > @@ -1473,8 +1473,10 @@ static int copy_filter_type(struct tep_event_fil=
ter *filter,
> >  =09if (strcmp(str, "TRUE") =3D=3D 0 || strcmp(str, "FALSE") =3D=3D 0) =
{
> >  =09=09/* Add trivial event */
> >  =09=09arg =3D allocate_arg();
> > -=09=09if (arg =3D=3D NULL)
> > +=09=09if (arg =3D=3D NULL) {
> > +=09=09=09free(str);
> >  =09=09=09return -1;
> > +=09=09}
> > =20
> >  =09=09arg->type =3D TEP_FILTER_ARG_BOOLEAN;
> >  =09=09if (strcmp(str, "TRUE") =3D=3D 0)
> > @@ -1483,8 +1485,11 @@ static int copy_filter_type(struct tep_event_fil=
ter *filter,
> >  =09=09=09arg->boolean.value =3D 0;
> > =20
> >  =09=09filter_type =3D add_filter_type(filter, event->id);
> > -=09=09if (filter_type =3D=3D NULL)
> > +=09=09if (filter_type =3D=3D NULL) {
> > +=09=09=09free(str);
> > +=09=09=09free(arg);
> >  =09=09=09return -1;
> > +=09=09}
> > =20
> >  =09=09filter_type->filter =3D arg;
> > =20