linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tools lib traceevent: Fix memory leakage in filter_event
@ 2019-12-09  6:35 Hewenliang
  2019-12-20  1:56 ` Steven Rostedt
  2019-12-23 21:35 ` [tip: perf/urgent] " tip-bot2 for Hewenliang
  0 siblings, 2 replies; 4+ messages in thread
From: Hewenliang @ 2019-12-09  6:35 UTC (permalink / raw)
  To: rostedt, acme, tstoyanov, linux-kernel; +Cc: linfeilong

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

Signed-off-by: Hewenliang <hewenliang4@huawei.com>
---
 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] tools lib traceevent: Fix memory leakage in filter_event
  2019-12-09  6:35 [PATCH] tools lib traceevent: Fix memory leakage in filter_event Hewenliang
@ 2019-12-20  1:56 ` Steven Rostedt
  2019-12-20 21:47   ` Arnaldo Carvalho de Melo
  2019-12-23 21:35 ` [tip: perf/urgent] " tip-bot2 for Hewenliang
  1 sibling, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2019-12-20  1:56 UTC (permalink / raw)
  To: Hewenliang; +Cc: acme, tstoyanov, linux-kernel, linfeilong

On Mon, 9 Dec 2019 01:35:49 -0500
Hewenliang <hewenliang4@huawei.com> 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 <hewenliang4@huawei.com>

This looks fine.

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

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);


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] tools lib traceevent: Fix memory leakage in filter_event
  2019-12-20  1:56 ` Steven Rostedt
@ 2019-12-20 21:47   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-20 21:47 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: Hewenliang, tstoyanov, linux-kernel, linfeilong

Em Thu, Dec 19, 2019 at 08:56:31PM -0500, Steven Rostedt escreveu:
> On Mon, 9 Dec 2019 01:35:49 -0500
> Hewenliang <hewenliang4@huawei.com> 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 <hewenliang4@huawei.com>
> 
> This looks fine.
> 
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> 
> 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);


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [tip: perf/urgent] tools lib traceevent: Fix memory leakage in filter_event
  2019-12-09  6:35 [PATCH] tools lib traceevent: Fix memory leakage in filter_event Hewenliang
  2019-12-20  1:56 ` Steven Rostedt
@ 2019-12-23 21:35 ` tip-bot2 for Hewenliang
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Hewenliang @ 2019-12-23 21:35 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Hewenliang, Steven Rostedt (VMware),
	Feilong Lin, Tzvetomir Stoyanov, Arnaldo Carvalho de Melo, x86,
	LKML

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 <hewenliang4@huawei.com>
AuthorDate:    Mon, 09 Dec 2019 01:35:49 -05:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
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 <hewenliang4@huawei.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Feilong Lin <linfeilong@huawei.com>
Cc: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Link: http://lore.kernel.org/lkml/20191209063549.59941-1-hewenliang4@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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);

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-23 21:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-09  6:35 [PATCH] tools lib traceevent: Fix memory leakage in filter_event Hewenliang
2019-12-20  1:56 ` Steven Rostedt
2019-12-20 21:47   ` Arnaldo Carvalho de Melo
2019-12-23 21:35 ` [tip: perf/urgent] " tip-bot2 for Hewenliang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).