This is a note to let you know that I've just added the patch titled
mfd: max77693: Fix possible NULL pointer dereference on 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-max77693-fix-possible-null-pointer-dereference-on-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 ad09dd6a1f5d6244bd89314015af506ba7f9810a Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
Date: Tue, 11 Feb 2014 11:03:32 +0100
Subject: mfd: max77693: Fix possible NULL pointer dereference on i2c_new_dummy error
From: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
commit ad09dd6a1f5d6244bd89314015af506ba7f9810a upstream.
During probe the driver allocates dummy I2C devices for MUIC and haptic
with i2c_new_dummy() but it does not check the return value of this
calls.
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() and i2c_unregister_device().
If i2c_new_dummy() fails for MUIC or haptic devices, 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/max77693.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -149,9 +149,18 @@ static int max77693_i2c_probe(struct i2c
dev_info(max77693->dev, "device ID: 0x%x\n", reg_data);
max77693->muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC);
+ if (!max77693->muic) {
+ dev_err(max77693->dev, "Failed to allocate I2C device for MUIC\n");
+ return -ENODEV;
+ }
i2c_set_clientdata(max77693->muic, max77693);
max77693->haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC);
+ if (!max77693->haptic) {
+ dev_err(max77693->dev, "Failed to allocate I2C device for Haptic\n");
+ ret = -ENODEV;
+ goto err_i2c_haptic;
+ }
i2c_set_clientdata(max77693->haptic, max77693);
/*
@@ -187,8 +196,9 @@ err_mfd:
max77693_irq_exit(max77693);
err_irq:
err_regmap_muic:
- i2c_unregister_device(max77693->muic);
i2c_unregister_device(max77693->haptic);
+err_i2c_haptic:
+ i2c_unregister_device(max77693->muic);
return ret;
}
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