aboutsummaryrefslogtreecommitdiffstats
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:04:23 +0100
commit1b8dd2d64ea9b5c81b9cbf1686f42fb974e907a0 (patch)
treebb340a92aceb5d3c5866c004d887e7dade188844
parent77ca19cf335772b79c1a76b6f108463a5402ace4 (diff)
downloadlinux-yocto-1b8dd2d64ea9b5c81b9cbf1686f42fb974e907a0.tar.gz
linux-yocto-1b8dd2d64ea9b5c81b9cbf1686f42fb974e907a0.tar.bz2
linux-yocto-1b8dd2d64ea9b5c81b9cbf1686f42fb974e907a0.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 08d929f77730..c9e5381a887b 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -591,9 +591,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
}
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)