* [PATCH] kernel/power/energy_model.c: fix memory leak with using debugfs_lookup()
@ 2023-02-02 15:15 Greg Kroah-Hartman
2023-02-09 19:37 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Greg Kroah-Hartman @ 2023-02-02 15:15 UTC (permalink / raw)
To: linux-pm
Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Pavel Machek, Len Brown,
linux-kernel
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: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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 f82111837b8d..7b44f5b89fa1 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -87,10 +87,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.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kernel/power/energy_model.c: fix memory leak with using debugfs_lookup()
2023-02-02 15:15 [PATCH] kernel/power/energy_model.c: fix memory leak with using debugfs_lookup() Greg Kroah-Hartman
@ 2023-02-09 19:37 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2023-02-09 19:37 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-pm, Rafael J. Wysocki, Pavel Machek, Len Brown, linux-kernel
On Thu, Feb 2, 2023 at 4:15 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> 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: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Len Brown <len.brown@intel.com>
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> 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 f82111837b8d..7b44f5b89fa1 100644
> --- a/kernel/power/energy_model.c
> +++ b/kernel/power/energy_model.c
> @@ -87,10 +87,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)
> --
Applied as 6.3 material, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-09 19:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-02 15:15 [PATCH] kernel/power/energy_model.c: fix memory leak with using debugfs_lookup() Greg Kroah-Hartman
2023-02-09 19:37 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).