From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Navid Emamdoost <navid.emamdoost@gmail.com>
Subject: [for-linus][PATCH 3/5] tracing: Have error path in predicate_parse() free its allocated memory
Date: Sun, 29 Sep 2019 16:06:45 -0400 [thread overview]
Message-ID: <20190929200748.549323921@goodmis.org> (raw)
In-Reply-To: 20190929200642.036511084@goodmis.org
From: Navid Emamdoost <navid.emamdoost@gmail.com>
In predicate_parse, there is an error path that is not going to
out_free instead it returns directly which leads to a memory leak.
Link: http://lkml.kernel.org/r/20190920225800.3870-1-navid.emamdoost@gmail.com
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_events_filter.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c773b8fb270c..c9a74f82b14a 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -452,8 +452,10 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
switch (*next) {
case '(': /* #2 */
- if (top - op_stack > nr_parens)
- return ERR_PTR(-EINVAL);
+ if (top - op_stack > nr_parens) {
+ ret = -EINVAL;
+ goto out_free;
+ }
*(++top) = invert;
continue;
case '!': /* #3 */
--
2.20.1
next prev parent reply other threads:[~2019-09-29 20:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-29 20:06 [for-linus][PATCH 0/5] tracing: Minor fixes for the last pull request Steven Rostedt
2019-09-29 20:06 ` [for-linus][PATCH 1/5] tracing/probe: Fix to check the difference of nr_args before adding probe Steven Rostedt
2019-09-29 20:06 ` [for-linus][PATCH 2/5] tracing: Fix clang -Wint-in-bool-context warnings in IF_ASSIGN macro Steven Rostedt
2019-09-29 20:06 ` Steven Rostedt [this message]
2019-09-29 20:06 ` [for-linus][PATCH 4/5] mm, tracing: Print symbol name for call_site in trace events Steven Rostedt
2019-09-29 20:06 ` [for-linus][PATCH 5/5] selftests/ftrace: Fix same probe error test Steven Rostedt
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=20190929200748.549323921@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=navid.emamdoost@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.