diff options
| author | David Lechner <david@lechnology.com> | 2018-02-19 15:43:01 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-20 12:07:43 +0000 |
| commit | 12ae3808c160b7be0de3c633ac4cbe8c5f2937bf (patch) | |
| tree | c0ea83e53096f971df9be32bbd4a1d8f8a7452d4 /drivers/base/regmap | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| download | linux-12ae3808c160b7be0de3c633ac4cbe8c5f2937bf.tar.gz linux-12ae3808c160b7be0de3c633ac4cbe8c5f2937bf.tar.bz2 linux-12ae3808c160b7be0de3c633ac4cbe8c5f2937bf.zip | |
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: David Lechner <david@lechnology.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base/regmap')
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index f3266334063e..7eb512ba2828 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -40,6 +40,7 @@ static ssize_t regmap_name_read_file(struct file *file, loff_t *ppos) { struct regmap *map = file->private_data; + const char *name = "nodev"; int ret; char *buf; @@ -47,7 +48,10 @@ static ssize_t regmap_name_read_file(struct file *file, if (!buf) 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) { kfree(buf); return ret; |