Message ID | 20230310133720.666999239@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp894265wrd; Fri, 10 Mar 2023 06:11:38 -0800 (PST) X-Google-Smtp-Source: AK7set9bpJE+7nLabApCoZqXEW6gz0pSV8neIDzBAsb1YcoXYTUOM/17KcaPVDYrcXUW24dJOJ/+ X-Received: by 2002:aa7:970f:0:b0:5d4:e4c8:2ef5 with SMTP id a15-20020aa7970f000000b005d4e4c82ef5mr21194992pfg.33.1678457498208; Fri, 10 Mar 2023 06:11:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678457498; cv=none; d=google.com; s=arc-20160816; b=BirUQvVDvPvQfu2XtLiTXP+1PW/sdQycOAKE5KrNaHcaZ6qaVAe+bQt7FpuV3B+KHW AamFtJcl8IlbkxitKDT+Rl+ImOOMvfP2ab5Yve84xsVRRmQWzs6DYG5Kj+fFjb7YSCGg df0ejFyGGkSPgHGJxRxPq8vTor9Sx84jrs7Oz4CkEszefqQi4JYfzNPOrRThNYoMwJQ+ M/8Sn3HR7+9+seXdJTXRv+oViUQ48gfc3NeT322A73PGQh0/lor967bbtNzaYOcW+FeH hXLAXkQLTCXzSr9iL46sE+TN2VccvHh86GLbFrfu3Dth560vG/lg2XaxL0lwuT9eBWRG DWEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7s8Cc3RX37KS2AKj+zxcVkp6+TBcRELmUMvK0H7fqP0=; b=Y/vf6KaYS3aAC2bkb/4KXEJkRhEQdZByVCG/PkzsToPw0QRzW/3+RoBW0oeF3c3LVG rlkFUS6aE1b/moJmbMsGtGa2irP1EqkuuX/FZUVKa8BXxfTBEeJ9wxsFmQeBfY1XKCD7 RDG7OQlrFOgzvB9M1UiL7LU8k3oXoP+4p9/ieHqfSy5E4OIq7hYWBGXcRRxVCbSuPVmS tyC0Du4zZoW0eVmY9raWEIviYcGpFo7Pzx6w9ZRVfqLQ8ISazh/oG2yc6tEE/Cx7CKMa VqcykBQ+mjzOY6KNJvYO9mnudIHjcQOCrKgtSZN+ONQzvDBDiu5UnbcYzGIjMJ1bb2Uq d1pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ecm7lXXy; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f185-20020a6251c2000000b00593cc8f94c7si1992991pfb.328.2023.03.10.06.11.19; Fri, 10 Mar 2023 06:11:38 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ecm7lXXy; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbjCJOKd (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Fri, 10 Mar 2023 09:10:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbjCJOKK (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 10 Mar 2023 09:10:10 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E43B15243; Fri, 10 Mar 2023 06:09:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C262B60F11; Fri, 10 Mar 2023 14:09:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8BADC4339B; Fri, 10 Mar 2023 14:09:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678457378; bh=QUVyWcpNPiRRb0YcbMLuwPP4ifg6zlz8Ly/SlacKjmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ecm7lXXyc0JDj2V3apLX9stUZPGi2LmA1bExGUPdhA7xyjJ18TGVxSuyqWPaXvXmX tRS7ISmBelFzpFlGpgafvBYyugOkVvYYdOIvJMlcMvMRXzQmgjeI5OMYMqEQRjDHYE 6U6iNdb/Gi+ATYjwLPm7CZqMn1OEnBb5yudadHgw= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, patches@lists.linux.dev, Chris Down <chris@chrisdown.name>, Petr Mladek <pmladek@suse.com>, Sergey Senozhatsky <senozhatsky@chromium.org>, Steven Rostedt <rostedt@goodmis.org>, John Ogness <john.ogness@linutronix.de>, linux-kernel@vger.kernel.org, Sasha Levin <sashal@kernel.org> Subject: [PATCH 6.1 116/200] kernel/printk/index.c: fix memory leak with using debugfs_lookup() Date: Fri, 10 Mar 2023 14:38:43 +0100 Message-Id: <20230310133720.666999239@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133717.050159289@linuxfoundation.org> References: <20230310133717.050159289@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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?1759990249939996022?= X-GMAIL-MSGID: =?utf-8?q?1759990249939996022?= |
Series |
None
|
|
Commit Message
Greg KH
March 10, 2023, 1:38 p.m. UTC
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [ Upstream commit 55bf243c514553e907efcf2bda92ba090eca8c64 ] When calling debugfs_lookup() the result must have dput() called on it, otherwise the memory will leak over time. To make things simpler, just call debugfs_lookup_and_remove() instead which handles all of the logic at once. Cc: Chris Down <chris@chrisdown.name> Cc: Petr Mladek <pmladek@suse.com> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: John Ogness <john.ogness@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Reviewed-by: John Ogness <john.ogness@linutronix.de> Reviewed-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20230202151411.2308576-1-gregkh@linuxfoundation.org Signed-off-by: Sasha Levin <sashal@kernel.org> --- kernel/printk/index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/printk/index.c b/kernel/printk/index.c index c85be186a7832..a6b27526baaf6 100644 --- a/kernel/printk/index.c +++ b/kernel/printk/index.c @@ -145,7 +145,7 @@ static void pi_create_file(struct module *mod) #ifdef CONFIG_MODULES static void pi_remove_file(struct module *mod) { - debugfs_remove(debugfs_lookup(pi_get_module_name(mod), dfs_index)); + debugfs_lookup_and_remove(pi_get_module_name(mod), dfs_index); } static int pi_module_notify(struct notifier_block *nb, unsigned long op,