| From 15d09aec508088201071bd25a60a65a1eec65ae5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 Sep 2019 17:57:59 -0500 |
| Subject: tracing: Have error path in predicate_parse() free its allocated |
| memory |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit 96c5c6e6a5b6db592acae039fed54b5c8844cd35 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.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 b949c3917c679..9be3d1d1fcb47 100644 |
| --- a/kernel/trace/trace_events_filter.c |
| +++ b/kernel/trace/trace_events_filter.c |
| @@ -451,8 +451,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.25.1 |
| |
