From: Beau Belgrave <beaub@linux.microsoft.com>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Xiu Jianfeng <xiujianfeng@huawei.com>,
rostedt@goodmis.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tracing/user_events: Fix memory leak in user_event_create()
Date: Tue, 15 Nov 2022 09:07:35 -0800 [thread overview]
Message-ID: <20221115170735.GA1794@kbox> (raw)
In-Reply-To: <20221116000717.4b62513eeaf0b2296b399bda@kernel.org>
On Wed, Nov 16, 2022 at 12:07:17AM +0900, Masami Hiramatsu wrote:
> On Tue, 15 Nov 2022 09:44:45 +0800
> Xiu Jianfeng <xiujianfeng@huawei.com> wrote:
>
> > Before current_user_event_group(), it has allocated memory and save it
> > in @name, this should freed before return error.
> >
Nice catch!
Acked-by: Beau Belgrave <beaub@linux.microsoft.com>
Thanks,
-Beau
> > Fixes: e5d271812e7a ("tracing/user_events: Move pages/locks into groups to prepare for namespaces")
> > Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
>
> This looks good to me.
>
> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
>
> Thanks,
>
> > ---
> > kernel/trace/trace_events_user.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
> > index ae78c2d53c8a..539b08ae7020 100644
> > --- a/kernel/trace/trace_events_user.c
> > +++ b/kernel/trace/trace_events_user.c
> > @@ -1100,8 +1100,10 @@ static int user_event_create(const char *raw_command)
> >
> > group = current_user_event_group();
> >
> > - if (!group)
> > + if (!group) {
> > + kfree(name);
> > return -ENOENT;
> > + }
> >
> > mutex_lock(&group->reg_mutex);
> >
> > --
> > 2.17.1
> >
>
>
> --
> Masami Hiramatsu (Google) <mhiramat@kernel.org>
prev parent reply other threads:[~2022-11-15 17:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 1:44 [PATCH] tracing/user_events: Fix memory leak in user_event_create() Xiu Jianfeng
2022-11-15 15:07 ` Masami Hiramatsu
2022-11-15 17:07 ` Beau Belgrave [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=20221115170735.GA1794@kbox \
--to=beaub@linux.microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=xiujianfeng@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox