From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Hewenliang <hewenliang4@huawei.com>,
Steven Rostedt <rostedt@goodmis.org>,
Feilong Lin <linfeilong@huawei.com>,
Tzvetomir Stoyanov <tstoyanov@vmware.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 1/4] tools lib traceevent: Fix memory leakage in filter_event
Date: Mon, 23 Dec 2019 10:32:38 -0300 [thread overview]
Message-ID: <20191223133241.8578-2-acme@kernel.org> (raw)
In-Reply-To: <20191223133241.8578-1-acme@kernel.org>
From: Hewenliang <hewenliang4@huawei.com>
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 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.21.1
next prev parent reply other threads:[~2019-12-23 13:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 13:32 [GIT PULL] perf/urgent improvements and fixes Arnaldo Carvalho de Melo
2019-12-23 13:32 ` Arnaldo Carvalho de Melo [this message]
2019-12-23 13:32 ` [PATCH 2/4] perf report: Fix incorrectly added dimensions as switch perf data file Arnaldo Carvalho de Melo
2019-12-23 13:32 ` [PATCH 3/4] perf map: Set kmap->kmaps backpointer for main kernel map chunks Arnaldo Carvalho de Melo
2020-02-06 9:40 ` Ravi Bangoria
2020-02-09 15:01 ` Jiri Olsa
2020-02-09 19:32 ` Jiri Olsa
2020-02-10 0:37 ` Jiri Olsa
2020-02-10 11:16 ` Ravi Bangoria
2020-02-10 13:13 ` Arnaldo Carvalho de Melo
2019-12-23 13:32 ` [PATCH 4/4] perf hists: Fix variable name's inconsistency in hists__for_each() macro Arnaldo Carvalho de Melo
2019-12-23 21:28 ` [GIT PULL] perf/urgent improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191223133241.8578-2-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=hewenliang4@huawei.com \
--cc=jolsa@kernel.org \
--cc=linfeilong@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tstoyanov@vmware.com \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).