[PATCH] mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error

2014-02-11 Thread Krzysztof Kozlowski
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.kozlow...@samsung.com
Cc: sta...@vger.kernel.org
---
 drivers/mfd/sec-core.c |4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index a139798b8065..7c6ce2e4aaa6 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,
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error

2014-02-11 Thread Lee Jones
 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.kozlow...@samsung.com
 Cc: sta...@vger.kernel.org
 ---
  drivers/mfd/sec-core.c |4 
  1 file changed, 4 insertions(+)

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html