lkml.org 
[lkml]   [2014]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 046/158] mfd: max8998: Fix possible NULL pointer dereference on i2c_new_dummy error
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit ed26f87b9f71693a1d1ee85f5e6209601505080f 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mfd/max8998.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/mfd/max8998.c
    +++ b/drivers/mfd/max8998.c
    @@ -215,6 +215,10 @@ static int max8998_i2c_probe(struct i2c_
    mutex_init(&max8998->iolock);

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

    max8998_irq_init(max8998);



    \
     
     \ /
      Last update: 2014-05-04 19:41    [W:4.064 / U:0.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site