[PATCH] regmap: fix NULL pointer dereference in _regmap_write/read

[PATCH] regmap: fix NULL pointer dereference in _regmap_write/read

[Pankaj Dubey]

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: Pankaj Dubey <pankaj.dubey@samsung.com>
---
 drivers/base/regmap/regmap.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 455a877..9980044 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1465,7 +1465,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
 
@@ -2115,7 +2115,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
 
-- 
1.7.9.5

Re: [PATCH] regmap: fix NULL pointer dereference in _regmap_write/read

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

On Sat, Sep 27, 2014 at 09:47:55AM +0530, Pankaj Dubey wrote:
> 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

This doesn't apply against current code since the same fix has already
been made.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] regmap: fix NULL pointer dereference in _regmap_write/read

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

On Sat, Sep 27, 2014 at 09:47:55AM +0530, Pankaj Dubey wrote:
> 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

Oops, sorry - actually it hadn't, git generated a confusing warning
which caused me to try to apply twice.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]