From: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
To: Hewenliang <hewenliang4@huawei.com>
Cc: rostedt@goodmis.org, acme@redhat.com, tstoyanov@vmware.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] tools lib traceevent: Fix memory leakage in copy_filter_type
Date: Thu, 21 Nov 2019 11:43:06 -0300 [thread overview]
Message-ID: <20191121144306.GG5078@kernel.org> (raw)
In-Reply-To: <20191119014415.57210-1-hewenliang4@huawei.com>
Em Mon, Nov 18, 2019 at 08:44:15PM -0500, Hewenliang escreveu:
> It is necessary to free the memory that we have allocated when error occurs.
>
> Fixes: ef3072cd1d5c ("tools lib traceevent: Get rid of die in add_filter_type()")
> Signed-off-by: Hewenliang <hewenliang4@huawei.com>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Thanks, applied.
- Arnaldo
> ---
> tools/lib/traceevent/parse-filter.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
> index 552592d153fb..f3cbf86e51ac 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_filter *filter,
> if (strcmp(str, "TRUE") == 0 || strcmp(str, "FALSE") == 0) {
> /* Add trivial event */
> arg = allocate_arg();
> - if (arg == NULL)
> + if (arg == NULL) {
> + free(str);
> return -1;
> + }
>
> arg->type = TEP_FILTER_ARG_BOOLEAN;
> if (strcmp(str, "TRUE") == 0)
> @@ -1483,8 +1485,11 @@ static int copy_filter_type(struct tep_event_filter *filter,
> arg->boolean.value = 0;
>
> filter_type = add_filter_type(filter, event->id);
> - if (filter_type == NULL)
> + if (filter_type == NULL) {
> + free(str);
> + free_arg(arg);
> return -1;
> + }
>
> filter_type->filter = arg;
>
> --
> 2.19.1
--
- Arnaldo
next prev parent reply other threads:[~2019-11-21 14:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 8:23 [PATCH] tools lib traceevent: Fix memory leakage in copy_filter_type Hewenliang
2019-11-13 19:46 ` Steven Rostedt
2019-11-13 19:47 ` Steven Rostedt
2019-11-13 20:37 ` Arnaldo Carvalho de Melo
2019-11-13 20:40 ` Steven Rostedt
2019-11-13 23:01 ` Arnaldo Carvalho de Melo
2019-11-18 3:42 ` Hewenliang
2019-11-19 1:44 ` [PATCH v2] " Hewenliang
2019-11-21 14:43 ` Arnaldo Carvalho de Melo [this message]
2019-11-23 8:15 ` [tip: perf/core] libtraceevent: " tip-bot2 for Hewenliang
2019-11-18 14:28 ` [PATCH v2] tools lib traceevent: " Steven Rostedt
2019-11-18 15:24 ` Arnaldo Carvalho de Melo
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=20191121144306.GG5078@kernel.org \
--to=arnaldo.melo@gmail.com \
--cc=acme@redhat.com \
--cc=hewenliang4@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tstoyanov@vmware.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