Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 15 Nov 2022 09:07:35 -0800
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()
Message-ID: <20221115170735.GA1794@kbox>
References: <20221115014445.158419-1-xiujianfeng@huawei.com>
 <20221116000717.4b62513eeaf0b2296b399bda@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221116000717.4b62513eeaf0b2296b399bda@kernel.org>
Precedence: bulk

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>