PM: EM: fix memory leak with using debugfs_lookup()

BugLink: https://bugs.launchpad.net/bugs/2011425
[ 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 <gregkh@linuxfoundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index f82111837b8d1da67386595c8207b9be06bcacb3..7b44f5b89fa1542580d27dec182883d6ff15e44f 100644 (file)
--- 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)