public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jeff Xie <[email protected]>
To: Steven Rostedt <[email protected]>
Cc: [email protected], Masami Hiramatsu <[email protected]>,
	Tom Zanussi <[email protected]>,
	[email protected]
Subject: Re: [PATCH] tracing: Fix possible crash in ftrace_free_ftrace_ops()
Date: Mon, 9 May 2022 09:33:44 +0800	[thread overview]
Message-ID: <CAEr6+EC+Kg4AJ=BFxrOSQV+KHj5WSm=1FtYCAPrn1gFnZUk-fg@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>

I am so sorry to bother you, this may be an invalid patch, kfree can
return directly from null. ;-)

On Mon, May 9, 2022 at 12:18 AM Jeff Xie <[email protected]> wrote:
>
> Currently if the ftrace_allocate_ftrace_ops() return -ENOMEM,
> the ftrace_free_ftrace_ops() will kfree(NULL).
>
> trace_array_create()
> {
>         ...
>         if (ftrace_allocate_ftrace_ops(tr) < 0)
>                 goto out_free_tr;
>         ...
> out_free_tr:
>         ftrace_free_ftrace_ops(tr);
>         ...
> }
>
> ftrace_allocate_ftrace_ops()
> {
>         ...
>         ops = kzalloc(sizeof(*ops), GFP_KERNEL);
>         if (!ops)
>                 return -ENOMEM;
>         ...
> }
>
> ftrace_free_ftrace_ops()
> {
>         kfree(tr->ops);
>         tr->ops = NULL;
> }
>
> Signed-off-by: Jeff Xie <[email protected]>
> ---
>  kernel/trace/trace_functions.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
> index 9f1bfbe105e8..d186d6101695 100644
> --- a/kernel/trace/trace_functions.c
> +++ b/kernel/trace/trace_functions.c
> @@ -73,6 +73,9 @@ int ftrace_allocate_ftrace_ops(struct trace_array *tr)
>
>  void ftrace_free_ftrace_ops(struct trace_array *tr)
>  {
> +       if (!tr->ops)
> +               return;
> +
>         kfree(tr->ops);
>         tr->ops = NULL;
>  }
> --
> 2.25.1
>

Thanks,
JeffXie


  reply	other threads:[~2022-05-09  1:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-08 16:18 [PATCH] tracing: Fix possible crash in ftrace_free_ftrace_ops() Jeff Xie
2022-05-09  1:33 ` Jeff Xie [this message]
2022-05-09  7:34   ` Ammar Faizi

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='CAEr6+EC+Kg4AJ=BFxrOSQV+KHj5WSm=1FtYCAPrn1gFnZUk-fg@mail.gmail.com' \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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