Skip to content

Commit 5f0b1cb

Browse files
whamesre
authored andcommitted
power: supply: bq25980: Fix use-after-free in power_supply_changed()
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>
1 parent 8005843 commit 5f0b1cb

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/power/supply/bq25980_charger.c

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

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

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

0 commit comments

Comments
 (0)