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 5D5A1C64ED6 for ; Sun, 26 Feb 2023 15:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231649AbjBZPGb (ORCPT ); Sun, 26 Feb 2023 10:06:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232130AbjBZPFj (ORCPT ); Sun, 26 Feb 2023 10:05:39 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E679220552; Sun, 26 Feb 2023 06:56:18 -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 C4F2A60C74; Sun, 26 Feb 2023 14:48:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33BBEC433B4; Sun, 26 Feb 2023 14:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422900; bh=zwmTiw4jNGEI+6WAvCEtRzDSNB+DvOn5KyjyWJ48JgU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JQdYV6X5LaI0+bKdyID4twOil94hQgzC3oWFh86yOt2KwUEWxuBYvlpDNRGucbOMX bCu2FNXb/TCXDoYOumz6IDImoZ0mvCnYGU+oxh8s2t9GgxZ2QN9blAEcXeOkNeabWE g+WtW/4duAraS/FMs6R4qZBwEuhcJa3nMX1gb7ZInGpQSsB0dEG073d0/mU0bLZdJw OTtaeD9eeLecN6dnHt4HNWKld+7o11NnQmsSpSpI9g/iiKM5rFhMohhf2xqu8+Dqk1 R+Y23Srt0DuHyOqQjYVuiTXOPOo8cuMl3G7wgtXN/NrSc5RTuc3Yuwe9Ur84hZrVvy NI/ia46Akg1gA== 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 6.1 39/49] PM: domains: fix memory leak with using debugfs_lookup() Date: Sun, 26 Feb 2023 09:46:39 -0500 Message-Id: <20230226144650.826470-39-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144650.826470-1-sashal@kernel.org> References: <20230226144650.826470-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 6471b559230e9..b411201f75bfb 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -220,13 +220,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