From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87686C6FA8E for ; Sun, 26 Feb 2023 14:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231334AbjBZO5T (ORCPT ); Sun, 26 Feb 2023 09:57:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231407AbjBZOz1 (ORCPT ); Sun, 26 Feb 2023 09:55:27 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 334FC1BADF; Sun, 26 Feb 2023 06:51:20 -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 sin.source.kernel.org (Postfix) with ESMTPS id B127BCE0E7A; Sun, 26 Feb 2023 14:50:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04C1BC4339B; Sun, 26 Feb 2023 14:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677423002; bh=RCGGN8lAkM2xap7FHRBK16eJJRZ5JoOmRgvpnyD1Kuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gvhdkDn/b1v1PSwukEtSKM/ew4uGMiuJ6YODJrWupj3dxS12g8yKS4Z0azANLui83 ezge5xet0KYJa2g3szWPbxWujtKWRF+QmNWSQlLBG1B9bllsrK3ryEQQ6FH2BAreLr ck12sFSAlat95XPr0kmsSEIQzcJUx1JuXW5JtfkOiBFfSX3bLwwK3AvcbYz0/HXkFo O8u8swYRvKyuoPL8fxKYREi6STgW4bqKk+WxbauaMk3Zzj6bY0rRM4NFP3qn6W33xw /8ZRL+wUxg0gpe3o7r2gG4GQ5K9miRRI67adpeOvWPfIWTIR3tII6pXOnvfk81wwFM GXnBK3tnX2euA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Ulf Hansson , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, khilman@kernel.org, pavel@ucw.cz, len.brown@intel.com, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 31/36] PM: domains: fix memory leak with using debugfs_lookup() Date: Sun, 26 Feb 2023 09:48:39 -0500 Message-Id: <20230226144845.827893-31-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144845.827893-1-sashal@kernel.org> References: <20230226144845.827893-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman [ Upstream commit 0b6200e1e9f53dabdc30d0f6c51af9a5f664d32b ] 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. Signed-off-by: Greg Kroah-Hartman Reviewed-by: Ulf Hansson Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/power/domain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 94fe30c187ad8..24a82e252b7e1 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -217,13 +217,10 @@ static void genpd_debug_add(struct generic_pm_domain *genpd); static void genpd_debug_remove(struct generic_pm_domain *genpd) { - struct dentry *d; - if (!genpd_debugfs_dir) return; - d = debugfs_lookup(genpd->name, genpd_debugfs_dir); - debugfs_remove(d); + debugfs_lookup_and_remove(genpd->name, genpd_debugfs_dir); } static void genpd_update_accounting(struct generic_pm_domain *genpd) -- 2.39.0