From: Krzysztof Kozlowski Date: Tue, 11 Feb 2014 10:03:35 +0000 (+0100) Subject: mfd: max8998: Fix possible NULL pointer dereference on i2c_new_dummy error X-Git-Tag: v3.2.58~43 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c330c022ae163cc84eff086720e28562570c2eaa;hp=792aa59f009d781878bd509ecc8fa65a94dfb4ab;p=pandora-kernel.git mfd: max8998: Fix possible NULL pointer dereference on i2c_new_dummy error 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 Signed-off-by: Lee Jones Signed-off-by: Ben Hutchings --- diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index de4096aee248..2fa6a28d3a99 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -152,6 +152,10 @@ static int max8998_i2c_probe(struct i2c_client *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);