Message ID | 20221124144823.750570677@goodmis.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3440624wrr; Thu, 24 Nov 2022 06:50:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6B+7JViYpzGKV7ZQH9NjW+S7SygmVsWwRchXh7o9DINRmZNgLxUowlfDpfkWU2osWCQuYI X-Received: by 2002:aa7:8d01:0:b0:562:83c1:59e0 with SMTP id j1-20020aa78d01000000b0056283c159e0mr35781076pfe.34.1669301419562; Thu, 24 Nov 2022 06:50:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669301419; cv=none; d=google.com; s=arc-20160816; b=q44ycuyKC10Xo1zFlYPtvyWEHjMdKeo+rSXnsGR2CZyyfkZef5wvY+VwTzJOvtL1Jn RiL8SDeIK1INsZSgSXmf50pCRTGjPzJijrO0MfpZJZ+oBX0/W5G7KqzLwjttCiSysCCz 26w0/O87h5mHfC558m0kp/l0y1mBDUBJvQaeOU22JsUMQgJEqAU3flppddMw6FMzLh7V ajPCDYJSp5RpMTEAg+1hk+bd3xvsctlez29WjRDBpB0IX86d3UOFm6tIhEyYwpjzR3yK t4fgDffwSvGo5cfu2JG+vMb5ZTFXJ9DMxuyckxAHOYcOjT3+PsgJc5kBSifNWvhDt1HW iBqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=H4kZGluh5VGON/5yb0tow+Dk7qlvYz4koEqTi+a2+Mk=; b=gfgsztU8VMER6HxzFaRrtsqxprOWLsuouis8EkvAj0sKDzKEgRMEBJU0NsvO6OzDCg QC9luNkMiuIvBm3kAJsabRyoV9xyNt+vTt4qYtgO2mPdT7FBIn6NT+iqPRV3F/7ntxaP 7PqF6p09yT2rFh8oSflTxi1ear/Kp6q85b8w4J/evSjiuaQQbVbM7Ecpf3OuPKzo7g2f seVDQmBtj4NAD5fb/pQSBsdIDGXCzjwSx6Ce3gS2jWdrd9kb4a1dC9183J3o2VPoPhom q5GGHsl53kt4KCWOUb5Nxd5KzIGL7lB2tFgng9q3H+bVg2SbOkvhkRy8d90TNxQDo0ch CXqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q17-20020a170902b11100b001768a29b9dfsi770518plr.68.2022.11.24.06.50.06; Thu, 24 Nov 2022 06:50:19 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229689AbiKXOsd (ORCPT <rfc822;fengqi706@gmail.com> + 99 others); Thu, 24 Nov 2022 09:48:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbiKXOs2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 24 Nov 2022 09:48:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B958D906B for <linux-kernel@vger.kernel.org>; Thu, 24 Nov 2022 06:48:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 38BCCB82839 for <linux-kernel@vger.kernel.org>; Thu, 24 Nov 2022 14:48:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB67CC4347C; Thu, 24 Nov 2022 14:48:24 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from <rostedt@goodmis.org>) id 1oyDWZ-001WrT-2p; Thu, 24 Nov 2022 09:48:23 -0500 Message-ID: <20221124144823.750570677@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 24 Nov 2022 09:47:54 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Xiu Jianfeng <xiujianfeng@huawei.com>, Beau Belgrave <beaub@linux.microsoft.com> Subject: [for-linus][PATCH 2/6] tracing/user_events: Fix memory leak in user_event_create() References: <20221124144752.427194398@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750389405719523840?= X-GMAIL-MSGID: =?utf-8?q?1750389405719523840?= |
Series |
tracing: Fixes for 6.1
|
|
Commit Message
Steven Rostedt
Nov. 24, 2022, 2:47 p.m. UTC
From: Xiu Jianfeng <xiujianfeng@huawei.com> Before current_user_event_group(), it has allocated memory and save it in @name, this should freed before return error. Link: https://lkml.kernel.org/r/20221115014445.158419-1-xiujianfeng@huawei.com Fixes: e5d271812e7a ("tracing/user_events: Move pages/locks into groups to prepare for namespaces") Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Acked-by: Beau Belgrave <beaub@linux.microsoft.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> --- 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);