| From a523e79425b6b563abc09af1077968d3e795c232 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 31 Oct 2021 16:25:22 +0100 |
| Subject: power: supply: bq27xxx: Fix kernel crash on IRQ handler register |
| error |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit cdf10ffe8f626d8a2edc354abf063df0078b2d71 ] |
| |
| When registering the IRQ handler fails, do not just return the error code, |
| this will free the devm_kzalloc()-ed data struct while leaving the queued |
| work queued and the registered power_supply registered with both of them |
| now pointing to free-ed memory, resulting in various kernel crashes |
| soon afterwards. |
| |
| Instead properly tear-down things on IRQ handler register errors. |
| |
| Fixes: 703df6c09795 ("power: bq27xxx_battery: Reorganize I2C into a module") |
| Cc: Andrew F. Davis <afd@ti.com> |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> |
| Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/power/supply/bq27xxx_battery_i2c.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c |
| index 2677c38a8a424..34229c1f43e31 100644 |
| --- a/drivers/power/supply/bq27xxx_battery_i2c.c |
| +++ b/drivers/power/supply/bq27xxx_battery_i2c.c |
| @@ -195,7 +195,8 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client, |
| dev_err(&client->dev, |
| "Unable to register IRQ %d error %d\n", |
| client->irq, ret); |
| - return ret; |
| + bq27xxx_battery_teardown(di); |
| + goto err_failed; |
| } |
| } |
| |
| -- |
| 2.33.0 |
| |