From patchwork Fri Mar 10 13:43:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 67450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp945727wrd; Fri, 10 Mar 2023 07:47:52 -0800 (PST) X-Google-Smtp-Source: AK7set/r8r/xQp8B1S+V1Ezv7qN2mRVVWf52POzVhk/et0KfuyWytx+QJnMo4j2Gti9leHn75paY X-Received: by 2002:a17:90b:3e89:b0:237:ae7c:15be with SMTP id rj9-20020a17090b3e8900b00237ae7c15bemr4745842pjb.30.1678463272357; Fri, 10 Mar 2023 07:47:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678463272; cv=none; d=google.com; s=arc-20160816; b=0f5btsdpRXuJG0RSaVrG7vhFM53C+PSJChMsTc6uP6DrkAl4Mc4h/xC7xuVBM2672w 5wPv3a/f0UqsTTd4VOTfhJefrJ/h9/qtwc7WPdJ6OhP7fICduJLyWQUNoheGtTPAX6HJ 5FoAxSuwG3xzKXdEt5PfYn1syr5orT84HKQGxZlgUyrlljCmrbBLxwH+ZA4QtsOGMedf 1ipi8bRX02vnAu21IGqOZ4wZZmX3RB9IYJ1Pnkmw3S5N/88TrmegFlx482NTnMGUohwS RBSPEfoC4iA+uQQddPbclQcoxGykiIDqOMpLrMTvc1Vx6fRNADGSj65QfW+yYhogQSWp 6mrA== 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=ktUeF3nKNn688SCfixECof5YS2oLm1r60xmTweIyDSY=; b=FkDLcANEcXDf2GYSI3I91lXE5vlVhjyxybeenK5cbMtY5LQ2ZinXU9dYhnxKoqvXDP XtRr+W4cxYMbTOoKlD0Wu7W4/2DIlfQk6W5GJTc0uA+/1jBEecX420eb60zjF7MFwrxM ErX7WdWS9Di22NAxJfbrgoTF0+KTr4EBHGb9VEz3OHhlQUTqYSOeE85lMxVBr3VDvDLJ BrFda57e0kRlmSacdDutqCztDZ59d4h+5AqU67pNGotYCK03NO3J4p/OF6gVOpn7vFJy gR6PVirb2bDemzGmynYci9EXgTqrXqJJCqFSZEfAyzHUKLNQjTMmQLFuMWo53/I5uipN 99pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BJi1A64O; 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 x16-20020a17090a789000b002340f45c0ffsi135394pjk.90.2023.03.10.07.47.38; Fri, 10 Mar 2023 07:47:52 -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=BJi1A64O; 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 S234145AbjCJP00 (ORCPT + 99 others); Fri, 10 Mar 2023 10:26:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234021AbjCJP0F (ORCPT ); Fri, 10 Mar 2023 10:26:05 -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 1EA59133DAA; Fri, 10 Mar 2023 07:15:22 -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 152EAB82303; Fri, 10 Mar 2023 15:14:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50716C433EF; Fri, 10 Mar 2023 15:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678461245; bh=dHotbitnGUdIopNw20MhJvLvqsb6KXrudSRC27coLOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BJi1A64OaBaSOFLJp9yvTdY1ii7U8w6BBcQc60LGFnMOJLCrZF1jhLaw9wjpt7iTv KNX9KAVUxBO9YyVDWM2dVbLhSL0z1mJQ/eOFKY5ftNW3K0raIxctvDLu+yppUiPd8E EbrRGTfGdcrf/mJ9A8rrGThzhZQCdxok3r10tglw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chris Down , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , John Ogness , linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH 5.15 074/136] kernel/printk/index.c: fix memory leak with using debugfs_lookup() Date: Fri, 10 Mar 2023 14:43:16 +0100 Message-Id: <20230310133709.391804716@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133706.811226272@linuxfoundation.org> References: <20230310133706.811226272@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759996304158641927?= X-GMAIL-MSGID: =?utf-8?q?1759996304158641927?= From: Greg Kroah-Hartman [ 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 Cc: Petr Mladek Cc: Sergey Senozhatsky Cc: Steven Rostedt Cc: John Ogness Cc: linux-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Reviewed-by: Sergey Senozhatsky Reviewed-by: John Ogness Reviewed-by: Petr Mladek Signed-off-by: Petr Mladek Link: https://lore.kernel.org/r/20230202151411.2308576-1-gregkh@linuxfoundation.org Signed-off-by: Sasha Levin --- 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 d3709408debe9..d23b8f8a51db5 100644 --- a/kernel/printk/index.c +++ b/kernel/printk/index.c @@ -146,7 +146,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,