Skip to content
/ linux Public

Commit cb5c743

Browse files
whameSasha Levin
authored andcommitted
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
[ Upstream commit 8005843 ] 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: 32e4978 ("power: supply: bq256xx: Introduce the BQ256XX charger driver") Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Link: https://patch.msgid.link/39da6da8cc060fa0382ca859f65071e791cb6119.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 697bb5d commit cb5c743

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/power/supply/bq256xx_charger.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,6 +1746,12 @@ static int bq256xx_probe(struct i2c_client *client)
17461746
usb_register_notifier(bq->usb3_phy, &bq->usb_nb);
17471747
}
17481748

1749+
ret = bq256xx_power_supply_init(bq, &psy_cfg, dev);
1750+
if (ret) {
1751+
dev_err(dev, "Failed to register power supply\n");
1752+
return ret;
1753+
}
1754+
17491755
if (client->irq) {
17501756
ret = devm_request_threaded_irq(dev, client->irq, NULL,
17511757
bq256xx_irq_handler_thread,
@@ -1758,12 +1764,6 @@ static int bq256xx_probe(struct i2c_client *client)
17581764
}
17591765
}
17601766

1761-
ret = bq256xx_power_supply_init(bq, &psy_cfg, dev);
1762-
if (ret) {
1763-
dev_err(dev, "Failed to register power supply\n");
1764-
return ret;
1765-
}
1766-
17671767
ret = bq256xx_hw_init(bq);
17681768
if (ret) {
17691769
dev_err(dev, "Cannot initialize the chip.\n");

0 commit comments

Comments
 (0)