From: Tomas Bortoli <tomasbortoli@gmail.com>
To: rostedt@goodmis.org
Cc: linux-kernel@vger.kernel.org, mingo@redhat.com,
Tomas Bortoli <tomasbortoli@gmail.com>
Subject: [PATCH] trace: Avoid memory leak in predicate_parse()
Date: Tue, 28 May 2019 17:43:38 +0200 [thread overview]
Message-ID: <20190528154338.29976-1-tomasbortoli@gmail.com> (raw)
In-Reply-To: <20190528104400.388e4c3f@gandalf.local.home>
In case of errors, predicate_parse() goes to the out_free label
to free memory and to return an error code.
However, predicate_parse() does not free the predicates of the
temporary prog_stack array, thence leaking them.
Signed-off-by: Tomas Bortoli <tomasbortoli@gmail.com>
Reported-by: syzbot+6b8e0fb820e570c59e19@syzkaller.appspotmail.com
---
kernel/trace/trace_events_filter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 05a66493a164..ecfa6f0f1c7e 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -427,7 +427,7 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
op_stack = kmalloc_array(nr_parens, sizeof(*op_stack), GFP_KERNEL);
if (!op_stack)
return ERR_PTR(-ENOMEM);
- prog_stack = kmalloc_array(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
+ prog_stack = kcalloc(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
if (!prog_stack) {
parse_error(pe, -ENOMEM, 0);
goto out_free;
@@ -578,6 +578,8 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
out_free:
kfree(op_stack);
kfree(inverts);
+ for (i = 0; prog_stack[i].pred; i++)
+ kfree(prog_stack[i].pred);
kfree(prog_stack);
return ERR_PTR(ret);
}
--
2.11.0
next prev parent reply other threads:[~2019-05-28 15:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 13:46 [PATCH] trace: Avoid memory leak in predicate_parse() Tomas Bortoli
2019-05-28 14:44 ` Steven Rostedt
2019-05-28 15:18 ` Tomas Bortoli
2019-05-28 15:29 ` Steven Rostedt
2019-05-28 15:32 ` Tomas Bortoli
2019-05-28 15:43 ` Tomas Bortoli [this message]
2019-05-28 15:48 ` Steven Rostedt
2019-05-28 15:55 ` Tomas Bortoli
2019-05-28 20:31 ` Steven Rostedt
2019-05-28 20:48 ` Tomas Bortoli
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=20190528154338.29976-1-tomasbortoli@gmail.com \
--to=tomasbortoli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/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.