aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-02-11 05:03:35 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 10:55:28 -0400
commitfe22769b213aade80d43b12b6f51c0ba7a9c0668 (patch)
tree14eddd7ea35c3ee6dc63d2c0fe1ff7ef6f87eae2
parent64ff251f373e35623e88333c1dc9ea118bbe857b (diff)
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 <k.kozlowski@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mfd/max8998.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index d7218cc90945..8381a76c69c0 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -152,6 +152,10 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
152 mutex_init(&max8998->iolock); 152 mutex_init(&max8998->iolock);
153 153
154 max8998->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR); 154 max8998->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
155 if (!max8998->rtc) {
156 dev_err(&i2c->dev, "Failed to allocate I2C device for RTC\n");
157 return -ENODEV;
158 }
155 i2c_set_clientdata(max8998->rtc, max8998); 159 i2c_set_clientdata(max8998->rtc, max8998);
156 160
157 max8998_irq_init(max8998); 161 max8998_irq_init(max8998);