summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-01-05 14:42:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-17 14:17:06 +0100
commit75e5e51acf59ff7436605ef91f486f9543534f9e (patch)
tree9e9501619c91f1c0403c70b0aedb2d8825e187f1
parent43f6ea41408b651180e49bef2f7a2f5f5d40a9a4 (diff)
downloadlinux-stable-75e5e51acf59ff7436605ef91f486f9543534f9e.tar.gz
linux-stable-75e5e51acf59ff7436605ef91f486f9543534f9e.tar.bz2
linux-stable-75e5e51acf59ff7436605ef91f486f9543534f9e.zip
regmap: debugfs: Fix a reversed if statement in regmap_debugfs_init()
commit f6bcb4c7f366905b66ce8ffca7190118244bb642 upstream. This code will leak "map->debugfs_name" because the if statement is reversed so it only frees NULL pointers instead of non-NULL. In fact the if statement is not required and should just be removed because kfree() accepts NULL pointers. Fixes: cffa4b2122f5 ("regmap: debugfs: Fix a memory leak when calling regmap_attach_dev") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/X/RQpfAwRdLg0GqQ@mwanda Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/regmap/regmap-debugfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index bf03cd343be2..ff2ee87987c7 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -594,9 +594,7 @@ void regmap_debugfs_init(struct regmap *map)
}
if (!strcmp(name, "dummy")) {
- if (!map->debugfs_name)
- kfree(map->debugfs_name);
-
+ kfree(map->debugfs_name);
map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d",
dummy_index);
if (!map->debugfs_name)