From: Tomas Bortoli <tomasbortoli@gmail.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, mingo@redhat.com
Subject: Re: [PATCH] trace: Avoid memory leak in predicate_parse()
Date: Tue, 28 May 2019 22:48:46 +0200 [thread overview]
Message-ID: <77f8591e-6230-7341-7bb3-0599c16bea92@gmail.com> (raw)
In-Reply-To: <20190528163104.67763762@gandalf.local.home>
On 5/28/19 10:31 PM, Steven Rostedt wrote:
> On Tue, 28 May 2019 17:43:38 +0200
> Tomas Bortoli <tomasbortoli@gmail.com> wrote:
>
>> @@ -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);
>> }
>
> I should have caught this, but thanks to the zero day bot, it found it
> first:
>
> kernel/trace/trace_events_filter.c:582:27-31: ERROR: prog_stack is NULL but dereferenced.
>
> I changed the patch with the following:
>
> From dfb4a6f2191a80c8b790117d0ff592fd712d3296 Mon Sep 17 00:00:00 2001
> From: Tomas Bortoli <tomasbortoli@gmail.com>
> Date: Tue, 28 May 2019 17:43:38 +0200
> Subject: [PATCH] tracing: Avoid memory leak in predicate_parse()
>
> 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.
>
> Link: http://lkml.kernel.org/r/20190528154338.29976-1-tomasbortoli@gmail.com
>
> Cc: stable@vger.kernel.org
> Fixes: 80765597bc587 ("tracing: Rewrite filter logic to be simpler and faster")
> Reported-by: syzbot+6b8e0fb820e570c59e19@syzkaller.appspotmail.com
> Signed-off-by: Tomas Bortoli <tomasbortoli@gmail.com>
> [ Added protection around freeing prog_stack[i].pred ]
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
> kernel/trace/trace_events_filter.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
> index d3e59312ef40..5079d1db3754 100644
> --- a/kernel/trace/trace_events_filter.c
> +++ b/kernel/trace/trace_events_filter.c
> @@ -428,7 +428,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;
> @@ -579,7 +579,11 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
> out_free:
> kfree(op_stack);
> kfree(inverts);
> - kfree(prog_stack);
> + if (prog_stack) {
> + for (i = 0; prog_stack[i].pred; i++)
> + kfree(prog_stack[i].pred);
> + kfree(prog_stack);
> + }
> return ERR_PTR(ret);
> }
>
>
Oops again, I should have been more careful.
Thanks.
prev parent reply other threads:[~2019-05-28 20:48 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
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 [this message]
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=77f8591e-6230-7341-7bb3-0599c16bea92@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.