Commit 12ae3808 authored by David Lechner's avatar David Lechner Committed by Mark Brown

regmap: Allow missing device in regmap_name_read_file()

This fixes a possible NULL pointer dereference oops in
regmap_name_read_file() when the regmap does not have a device
associated with it. For example syscon regmaps retrieved with
syscon_regmap_lookup_by_compatible() don't have a device.
Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb
...@@ -40,6 +40,7 @@ static ssize_t regmap_name_read_file(struct file *file, ...@@ -40,6 +40,7 @@ static ssize_t regmap_name_read_file(struct file *file,
loff_t *ppos) loff_t *ppos)
{ {
struct regmap *map = file->private_data; struct regmap *map = file->private_data;
const char *name = "nodev";
int ret; int ret;
char *buf; char *buf;
...@@ -47,7 +48,10 @@ static ssize_t regmap_name_read_file(struct file *file, ...@@ -47,7 +48,10 @@ static ssize_t regmap_name_read_file(struct file *file,
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
ret = snprintf(buf, PAGE_SIZE, "%s\n", map->dev->driver->name); if (map->dev && map->dev->driver)
name = map->dev->driver->name;
ret = snprintf(buf, PAGE_SIZE, "%s\n", name);
if (ret < 0) { if (ret < 0) {
kfree(buf); kfree(buf);
return ret; return ret;
......
Markdown is supported
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