This is a note to let you know that I've just added the patch titled
mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mfd-sec-core-fix-possible-null-pointer-dereference-when-i2c_new_dummy-error.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 65aba1e04916d72b30c028730a1e31860c225412 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
Date: Tue, 11 Feb 2014 10:12:25 +0100
Subject: mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error
From: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mfd/sec-core.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -199,6 +199,10 @@ static int sec_pmic_probe(struct i2c_cli
}
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);
if (pdata && pdata->cfg_pmic_irq)
Patches currently in stable-queue which might be from k.kozlowski@xxxxxxxxxxx are
queue-3.10/mfd-max8998-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
queue-3.10/mfd-tps65910-fix-possible-invalid-pointer-dereference-on-regmap_add_irq_chip-fail.patch
queue-3.10/mfd-88pm860x-fix-i2c-device-resource-leak-on-regmap-init-fail.patch
queue-3.10/mfd-88pm860x-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
queue-3.10/mfd-max77686-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
queue-3.10/mfd-max8925-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
queue-3.10/mfd-max77693-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
queue-3.10/mfd-sec-core-fix-possible-null-pointer-dereference-when-i2c_new_dummy-error.patch
queue-3.10/mfd-max8997-fix-possible-null-pointer-dereference-on-i2c_new_dummy-error.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html