Skip to content
/ linux Public

Commit 0560a4b

Browse files
whameSasha Levin
authored andcommitted
power: supply: bq25980: Fix use-after-free in power_supply_changed()
[ Upstream commit 5f0b1cb ] Using the `devm_` variant for requesting IRQ _before_ the `devm_` variant for allocating/registering the `power_supply` handle, means that the `power_supply` handle will be deallocated/unregistered _before_ the interrupt handler (since `devm_` naturally deallocates in reverse allocation order). This means that during removal, there is a race condition where an interrupt can fire just _after_ the `power_supply` handle has been freed, *but* just _before_ the corresponding unregistration of the IRQ handler has run. This will lead to the IRQ handler calling `power_supply_changed()` with a freed `power_supply` handle. Which usually crashes the system or otherwise silently corrupts the memory... Note that there is a similar situation which can also happen during `probe()`; the possibility of an interrupt firing _before_ registering the `power_supply` handle. This would then lead to the nasty situation of using the `power_supply` handle *uninitialized* in `power_supply_changed()`. Fix this racy use-after-free by making sure the IRQ is requested _after_ the registration of the `power_supply` handle. Fixes: 5069185 ("power: supply: bq25980: Add support for the BQ259xx family") Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Link: https://patch.msgid.link/8763035cadb959e14787b3837f2d3db61f6e1c34.1766268280.git.waqar.hameed@axis.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 74b5a88 commit 0560a4b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/power/supply/bq25980_charger.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,12 @@ static int bq25980_probe(struct i2c_client *client,
12411241
return ret;
12421242
}
12431243

1244+
ret = bq25980_power_supply_init(bq, dev);
1245+
if (ret) {
1246+
dev_err(dev, "Failed to register power supply\n");
1247+
return ret;
1248+
}
1249+
12441250
if (client->irq) {
12451251
ret = devm_request_threaded_irq(dev, client->irq, NULL,
12461252
bq25980_irq_handler_thread,
@@ -1251,12 +1257,6 @@ static int bq25980_probe(struct i2c_client *client,
12511257
return ret;
12521258
}
12531259

1254-
ret = bq25980_power_supply_init(bq, dev);
1255-
if (ret) {
1256-
dev_err(dev, "Failed to register power supply\n");
1257-
return ret;
1258-
}
1259-
12601260
ret = bq25980_hw_init(bq);
12611261
if (ret) {
12621262
dev_err(dev, "Cannot initialize the chip.\n");

0 commit comments

Comments
 (0)