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 4F963C64ED6 for ; Sun, 26 Feb 2023 15:00:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231193AbjBZPAt (ORCPT ); Sun, 26 Feb 2023 10:00:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231135AbjBZO60 (ORCPT ); Sun, 26 Feb 2023 09:58:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 874CB1C7F5; Sun, 26 Feb 2023 06:52:24 -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 2D56660C19; Sun, 26 Feb 2023 14:51:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD5A9C433A1; Sun, 26 Feb 2023 14:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677423075; bh=OVM5a6S+FXjYx1lYy+zj89/O07ME4c0Ww/3AY5VAy1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OMBRUdY4JoNDH0Ej6jzqCHZuo7yjtPs3+QsFmTX2gaP3B9CjKHCc9Vki1Dr1Gh99w ePa4+hUy+JkjyOfRFtm+5GdZtVHU0qJWgAbfPw4Fdp/lYFOIfTsAF58acSgkTqpj9F DTM/uxzb0LDMWJIjF0xe0908tm6ehCbUtFMqbmnKL+cImSm/tJC/ZTsNg1EUmVMHtf 8LhR3mwiQq1mVWIrazJ/jAjdN8UNYMa8QiAJa72gR0ZRo6Fj3Kbz06UbwZnr69+gx/ jgDrFmvQRuBNcuXHGhL1XCOGpx+rqkqt5rZXUcfd7XHPyJMxyxrS0azhtGVeSvHznU HO4AZ7GHsvC6g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, len.brown@intel.com, pavel@ucw.cz, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 25/27] PM: EM: fix memory leak with using debugfs_lookup() Date: Sun, 26 Feb 2023 09:50:12 -0500 Message-Id: <20230226145014.828855-25-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226145014.828855-1-sashal@kernel.org> References: <20230226145014.828855-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-pm@vger.kernel.org From: Greg Kroah-Hartman [ Upstream commit a0e8c13ccd6a9a636d27353da62c2410c4eca337 ] 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 Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/energy_model.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c index 119b929dcff0f..334173fe6940e 100644 --- a/kernel/power/energy_model.c +++ b/kernel/power/energy_model.c @@ -72,10 +72,7 @@ static void em_debug_create_pd(struct device *dev) static void em_debug_remove_pd(struct device *dev) { - struct dentry *debug_dir; - - debug_dir = debugfs_lookup(dev_name(dev), rootdir); - debugfs_remove_recursive(debug_dir); + debugfs_lookup_and_remove(dev_name(dev), rootdir); } static int __init em_debug_init(void) -- 2.39.0