From patchwork Sun Nov 20 20:12:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 23460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1257540wrr; Sun, 20 Nov 2022 12:35:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf7QB3XqxkyTlpCbgK6lx5SHoYPyZBeRQ3aW5AIoOYUGvCL+pX/K7Nc0C3oo97/XAJtdiD1k X-Received: by 2002:a17:902:f78a:b0:188:a51c:b570 with SMTP id q10-20020a170902f78a00b00188a51cb570mr9137802pln.7.1668976517102; Sun, 20 Nov 2022 12:35:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668976517; cv=none; d=google.com; s=arc-20160816; b=X9+Vvt2RHD59kCJulG0SqAyLFE7OIU0MN3znfzsIGbL4VqzRDdUKi66Fe4dX13zotV 3iZ2qNSG5wO5HCf0KhmoJBWK3HmIrvUwEBTQKc2XHapWhshOqeHsXOJUImaaANwn/8HU xyVA1FccdF1v6w6J8CqThWFuI6YadXJAVs/OetHw16mhllRJdIFaqQdNiwvdZepjYD/l RA5gDYhtytbOifw3MOxx8NL3oVUk2EoaZGk0pU9Z4JzCC3CIw2N88utYkxU7/gUmk3I1 HVj22KXr+r/y1mOBc0xN26z32I+M+jfsM91FYa9MbF3L3rOe3s2hEy79JskjrroB9/IL 1LKQ== 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=Gc4JMRdVBiaWmPAUh/M8rZZZjgY8V8als2nE4c7W8Q4=; b=fmbOCCYWRHUx+QoTLla0PTk9yMsPV4fHL+j075bkQ4qM1AhNOIfN7XsmXkoIM9O61W 6JD8iDn1aO4mRHbuZTDDqOuzdAQYNJpbq2v34Qh+6LEPTMTW1VohCapTKNzNBDWTn8Qj MibCLkTTBx32SciL9zNKLSF1zAudIJJUwJg1i1BdzYlaH0XJeG0C3qFEGy7MdbplZ/KG XirNgCnSsIhsT1NORle7eoCC5bZ0Fx5j1ATa3zcgpB+Ljo9CDfkcZt5WcVV87heVb7RF B50v8+8YwfW/lvQKuKBXs4xqJeX16Ra2M3vgVpbc2GGinxA0GPuueWkYcILczwZnn9xg z+6g== 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 z42-20020a056a001daa00b0056d789ba707si9181260pfw.294.2022.11.20.12.35.02; Sun, 20 Nov 2022 12:35:17 -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 S229939AbiKTUMx (ORCPT + 99 others); Sun, 20 Nov 2022 15:12:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbiKTUMa (ORCPT ); Sun, 20 Nov 2022 15:12:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D96D0E8A; Sun, 20 Nov 2022 12:12:25 -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 8D865B80B87; Sun, 20 Nov 2022 20:12:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FE4CC433D7; Sun, 20 Nov 2022 20:12:23 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1owqfu-00DiXZ-1X; Sun, 20 Nov 2022 15:12:22 -0500 Message-ID: <20221120201222.349027009@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 20 Nov 2022 15:12:00 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Yi Yang Subject: [for-linus][PATCH 4/7] rethook: fix a potential memleak in rethook_alloc() References: <20221120201156.868430827@goodmis.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750048720006158426?= X-GMAIL-MSGID: =?utf-8?q?1750048720006158426?= From: Yi Yang In rethook_alloc(), the variable rh is not freed or passed out if handler is NULL, which could lead to a memleak, fix it. Link: https://lore.kernel.org/all/20221110104438.88099-1-yiyang13@huawei.com/ [Masami: Add "rethook:" tag to the title.] Fixes: 54ecbe6f1ed5 ("rethook: Add a generic return hook") Cc: stable@vger.kernel.org Signed-off-by: Yi Yang Acke-by: Masami Hiramatsu (Google) Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/rethook.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/trace/rethook.c b/kernel/trace/rethook.c index c69d82273ce7..32c3dfdb4d6a 100644 --- a/kernel/trace/rethook.c +++ b/kernel/trace/rethook.c @@ -83,8 +83,10 @@ struct rethook *rethook_alloc(void *data, rethook_handler_t handler) { struct rethook *rh = kzalloc(sizeof(struct rethook), GFP_KERNEL); - if (!rh || !handler) + if (!rh || !handler) { + kfree(rh); return NULL; + } rh->data = data; rh->handler = handler;