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

Commit 5336be84 authored by Pankaj Dubey's avatar Pankaj Dubey Committed by Mark Brown
Browse files

regmap: fix NULL pointer dereference in _regmap_write/read 



If LOG_DEVICE is defined and map->dev is NULL it will lead to NULL
pointer dereference. This patch fixes this issue by adding check for
dev->NULL in all such places in regmap.c

Signed-off-by: default avatarPankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 7d1311b9

drivers/base/regmap/regmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ int _regmap_write(struct regmap *map, unsigned int reg, 
	}



#ifdef LOG_DEVICE

	if (strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

	if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

		dev_info(map->dev, "%x <= %x\n", reg, val);

#endif
@@ -2058,7 +2058,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg, 
	ret = map->reg_read(context, reg, val);

	if (ret == 0) {

#ifdef LOG_DEVICE

		if (strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

		if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

			dev_info(map->dev, "%x => %x\n", reg, *val);

#endif