Commit 2c98e0c1 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

regmap: debugfs: fix possbile NULL pointer dereference

If 'map->dev' is NULL and there will lead dev_name() to be NULL pointer
dereference. So before dev_name(), we need to have check of the map->dev

We also should make sure that the 'name' pointer shouldn't be NULL for
debugfs_create_dir(). So here using one default "dummy" debugfs name when
the 'name' pointer and 'map->dev' are both NULL.

Signed-off-by: default avatarXiubo Li <>
Signed-off-by: Mark Brown's avatarMark Brown <>
parent 7d1311b9
......@@ -473,6 +473,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
struct rb_node *next;
struct regmap_range_node *range_node;
const char *devname = "dummy";
/* If we don't have the debugfs root yet, postpone init */
if (!regmap_debugfs_root) {
......@@ -491,12 +492,15 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
if (map->dev)
devname = dev_name(map->dev);
if (name) {
map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s",
dev_name(map->dev), name);
devname, name);
name = map->debugfs_name;
} else {
name = dev_name(map->dev);
name = devname;
map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment