From: Krzysztof Kozlowski Date: Tue, 11 Feb 2014 10:03:31 +0000 (+0100) Subject: mfd: max77686: Fix possible NULL pointer dereference on i2c_new_dummy error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9e183a1d495cd65412abe0f9df19b151716bfe7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git mfd: max77686: Fix possible NULL pointer dereference on i2c_new_dummy error 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. Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index f53d5823a3f7..e5fce765accb 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -121,6 +121,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);