lkml.org 
[lkml]   [2014]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 053/105] regmap: fix NULL pointer dereference in _regmap_write/read
    Date
    3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pankaj Dubey <pankaj.dubey@samsung.com>

    commit 5336be8416a71b5568d2cf54a2f2066abe9f2a53 upstream.

    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>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.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 f8214ec..1ac3c9a 100644
    --- a/drivers/base/regmap/regmap.c
    +++ b/drivers/base/regmap/regmap.c
    @@ -1308,7 +1308,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

    @@ -1727,7 +1727,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.9.1


    \
     
     \ /
      Last update: 2014-10-27 20:41    [W:2.447 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site