diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-11 10:12:25 +0100 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 11:40:14 +0800 |
| commit | 0a35431227de7813c195ffdeeb95f225129c49df (patch) | |
| tree | 677af25a111d3f98c1163e11b3a61db8784d038b /drivers/mfd | |
| parent | a385f7ae8ed62f2580b3e6f8c6f1ccf1c61f1b71 (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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/sec-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index 714e2135210..a76cd85a286 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -252,6 +252,10 @@ static int sec_pmic_probe(struct i2c_client *i2c, } sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR); + if (!sec_pmic->rtc) { + dev_err(&i2c->dev, "Failed to allocate I2C for RTC\n"); + return -ENODEV; + } i2c_set_clientdata(sec_pmic->rtc, sec_pmic); sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, |