Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/base/regmap/regmap-debugfs.c

+5 −1
Original line number Diff line number Diff line
@@ -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;