lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 070/182] mfd: max77686: Fix possible NULL pointer dereference on i2c_new_dummy error
    Date
    3.11.10.9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Krzysztof Kozlowski <k.kozlowski@samsung.com>

    commit b9e183a1d495cd65412abe0f9df19b151716bfe7 upstream.

    During probe the driver allocates dummy I2C device for RTC with
    i2c_new_dummy() but it does not check the return value of this call.

    In case of error (i2c_new_device(): memory allocation failure or I2C
    address cannot be used) this function returns NULL which is later used
    by i2c_unregister_device().

    If i2c_new_dummy() fails for RTC device, fail also the probe for main
    MFD driver.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/mfd/max77686.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
    index 541b240..f50e03f 100644
    --- a/drivers/mfd/max77686.c
    +++ b/drivers/mfd/max77686.c
    @@ -120,6 +120,10 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
    dev_info(max77686->dev, "device found\n");

    max77686->rtc = i2c_new_dummy(i2c->adapter, I2C_ADDR_RTC);
    + if (!max77686->rtc) {
    + dev_err(max77686->dev, "Failed to allocate I2C device for RTC\n");
    + return -ENODEV;
    + }
    i2c_set_clientdata(max77686->rtc, max77686);

    max77686_irq_init(max77686);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-24 11:01    [W:3.764 / U:1.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site