2019-12-09 06:38:05

by h00486469

Subject: [PATCH] tools lib traceevent: Fix memory leakage in filter_event

It is necessary to call free_arg(arg) when add_filter_type returns NULL in
the function of filter_event.

Signed-off-by: Hewenliang <[email protected]>
---
tools/lib/traceevent/parse-filter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index f3cbf86e51ac..20eed719542e 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1228,8 +1228,10 @@ filter_event(struct tep_event_filter *filter, struct tep_event *event,
}

filter_type = add_filter_type(filter, event->id);
- if (filter_type == NULL)
+ if (filter_type == NULL) {
+ free_arg(arg);
return TEP_ERRNO__MEM_ALLOC_FAILED;
+ }

if (filter_type->filter)
free_arg(filter_type->filter);
--
2.19.1

2019-12-20 01:58:03

by Steven Rostedt

Subject: Re: [PATCH] tools lib traceevent: Fix memory leakage in filter_event

On Mon, 9 Dec 2019 01:35:49 -0500
Hewenliang <[email protected]> wrote:

> It is necessary to call free_arg(arg) when add_filter_type returns NULL in
> the function of filter_event.
>
> Signed-off-by: Hewenliang <[email protected]>

This looks fine.

Reviewed-by: Steven Rostedt (VMware) <[email protected]>

Arnaldo, care to take this?

-- Steve

> ---
> tools/lib/traceevent/parse-filter.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
> index f3cbf86e51ac..20eed719542e 100644
> --- a/tools/lib/traceevent/parse-filter.c
> +++ b/tools/lib/traceevent/parse-filter.c
> @@ -1228,8 +1228,10 @@ filter_event(struct tep_event_filter *filter, struct tep_event *event,
> }
>
> filter_type = add_filter_type(filter, event->id);
> - if (filter_type == NULL)
> + if (filter_type == NULL) {
> + free_arg(arg);
> return TEP_ERRNO__MEM_ALLOC_FAILED;
> + }
>
> if (filter_type->filter)
> free_arg(filter_type->filter);

2019-12-20 21:48:48

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] tools lib traceevent: Fix memory leakage in filter_event

Em Thu, Dec 19, 2019 at 08:56:31PM -0500, Steven Rostedt escreveu:
> On Mon, 9 Dec 2019 01:35:49 -0500
> Hewenliang <[email protected]> wrote:
>
> > It is necessary to call free_arg(arg) when add_filter_type returns NULL in
> > the function of filter_event.
> >
> > Signed-off-by: Hewenliang <[email protected]>
>
> This looks fine.
>
> Reviewed-by: Steven Rostedt (VMware) <[email protected]>
>
> Arnaldo, care to take this?

Sure, just landed in acme/perf/urgent :)

- Arnaldo

> -- Steve
>
> > ---
> > tools/lib/traceevent/parse-filter.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
> > index f3cbf86e51ac..20eed719542e 100644
> > --- a/tools/lib/traceevent/parse-filter.c
> > +++ b/tools/lib/traceevent/parse-filter.c
> > @@ -1228,8 +1228,10 @@ filter_event(struct tep_event_filter *filter, struct tep_event *event,
> > }
> >
> > filter_type = add_filter_type(filter, event->id);
> > - if (filter_type == NULL)
> > + if (filter_type == NULL) {
> > + free_arg(arg);
> > return TEP_ERRNO__MEM_ALLOC_FAILED;
> > + }
> >
> > if (filter_type->filter)
> > free_arg(filter_type->filter);

2019-12-23 21:37:29

by tip-bot2 for Kyle Huey

Subject: [tip: perf/urgent] tools lib traceevent: Fix memory leakage in filter_event

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID: f84ae29a6169318f9c929720c49d96323d2bbab9
Gitweb: https://git.kernel.org/tip/f84ae29a6169318f9c929720c49d96323d2bbab9
Author: Hewenliang <[email protected]>
AuthorDate: Mon, 09 Dec 2019 01:35:49 -05:00
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Fri, 20 Dec 2019 18:47:50 -03:00

tools lib traceevent: Fix memory leakage in filter_event

It is necessary to call free_arg(arg) when add_filter_type() returns NULL
in filter_event().

Signed-off-by: Hewenliang <[email protected]>
Reviewed-by: Steven Rostedt (VMware) <[email protected]>
Cc: Feilong Lin <[email protected]>
Cc: Tzvetomir Stoyanov <[email protected]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/lib/traceevent/parse-filter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index f3cbf86..20eed71 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1228,8 +1228,10 @@ filter_event(struct tep_event_filter *filter, struct tep_event *event,
}

filter_type = add_filter_type(filter, event->id);
- if (filter_type == NULL)
+ if (filter_type == NULL) {
+ free_arg(arg);
return TEP_ERRNO__MEM_ALLOC_FAILED;
+ }

if (filter_type->filter)
free_arg(filter_type->filter);