summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeng Li <Meng.Li@windriver.com>2021-02-26 05:17:37 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-14 11:52:18 +0300
commitb9e569ae1da3a113b3acee8703c94777fd20938a (patch)
tree639a48628377e516429b5c3bd2cf5fc17aadefaa
parent89e2375bafbcf10280d923a4b6ce05a25c02cb8e (diff)
downloadlinux-b9e569ae1da3a113b3acee8703c94777fd20938a.tar.xz
regmap: set debugfs_name to NULL after it is freed
[ Upstream commit e41a962f82e7afb5b1ee644f48ad0b3aee656268 ] There is a upstream commit cffa4b2122f5("regmap:debugfs: Fix a memory leak when calling regmap_attach_dev") that adds a if condition when create name for debugfs_name. With below function invoking logical, debugfs_name is freed in regmap_debugfs_exit(), but it is not created again because of the if condition introduced by above commit. regmap_reinit_cache() regmap_debugfs_exit() ... regmap_debugfs_init() So, set debugfs_name to NULL after it is freed. Fixes: cffa4b2122f5 ("regmap: debugfs: Fix a memory leak when calling regmap_attach_dev") Signed-off-by: Meng Li <Meng.Li@windriver.com> Link: https://lore.kernel.org/r/20210226021737.7690-1-Meng.Li@windriver.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/base/regmap/regmap-debugfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index ff2ee87987c7..211a335a608d 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -660,6 +660,7 @@ void regmap_debugfs_exit(struct regmap *map)
regmap_debugfs_free_dump_cache(map);
mutex_unlock(&map->cache_lock);
kfree(map->debugfs_name);
+ map->debugfs_name = NULL;
} else {
struct regmap_debugfs_node *node, *tmp;