Skip to contentSkip to conversation

kernel/power/energy_model.c: fix memory leak with using debugfs_lookup()

PATCH Applied Greg Kroah-Hartman 2 participants 2 messages Feb 2, 2023 – Feb 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/power/energy_model.c: fix memory leak with using debugfs_lookup()

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.

---
 kernel/power/energy_model.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
kernel/power/energy_model.c +1 -4
index f82111837b8d..7b44f5b89fa1 100644
@@ -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)
Signature · 1 line
2.39.1
maintainer Applied
#1 lore raw
Quoted 23 lines · Greg Kroah-Hartman

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.

---
 kernel/power/energy_model.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
kernel/power/energy_model.c +0 -0
index f82111837b8d..7b44f5b89fa1 100644
@@ -87,10 +87,7 @@ static void em_debug_create_pd(struct device *dev)
 
 static void em_debug_remove_pd(struct device *dev)

kernel/power/energy_model.c static void em_debug_create_pd(struct device *dev)

Quoted 10 lines
kernel/power/energy_model.c +1 -5
 {
-       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!