aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-02-11 04:12:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 10:55:27 -0400
commitaea2ad9c6196b0adb3d863e4bcc2f74c4d57e7c2 (patch)
treed162e1d0283d1c527986a894b360d3dfe40f48d2
parent8343a52ace5428678b689273fe0c2298f7a9e2a9 (diff)
mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error
commit 65aba1e04916d72b30c028730a1e31860c225412 upstream. During probe the sec-core driver allocates dummy I2C device for RTC with i2c_new_dummy() but return value is not checked. 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 devm_regmap_init_i2c() or 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/sec-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 77ee26ef5941..81cfe8817fe0 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -199,6 +199,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
199 } 199 }
200 200
201 sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR); 201 sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
202 if (!sec_pmic->rtc) {
203 dev_err(&i2c->dev, "Failed to allocate I2C for RTC\n");
204 return -ENODEV;
205 }
202 i2c_set_clientdata(sec_pmic->rtc, sec_pmic); 206 i2c_set_clientdata(sec_pmic->rtc, sec_pmic);
203 207
204 if (pdata && pdata->cfg_pmic_irq) 208 if (pdata && pdata->cfg_pmic_irq)