Skip to content
/ linux Public

Commit f3fbe30

Browse files
whameSasha Levin
authored andcommitted
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
[ Upstream commit 642f33e ] 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: 874b2ad ("power: supply: cpcap-battery: Add a battery driver") Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Link: https://patch.msgid.link/81db58d610c9a51a68184f856cd431a934cccee2.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 4aeaf03 commit f3fbe30

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/power/supply/cpcap-battery.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,10 +1122,6 @@ static int cpcap_battery_probe(struct platform_device *pdev)
11221122

11231123
platform_set_drvdata(pdev, ddata);
11241124

1125-
error = cpcap_battery_init_interrupts(pdev, ddata);
1126-
if (error)
1127-
return error;
1128-
11291125
error = cpcap_battery_init_iio(ddata);
11301126
if (error)
11311127
return error;
@@ -1142,6 +1138,10 @@ static int cpcap_battery_probe(struct platform_device *pdev)
11421138
return error;
11431139
}
11441140

1141+
error = cpcap_battery_init_interrupts(pdev, ddata);
1142+
if (error)
1143+
return error;
1144+
11451145
atomic_set(&ddata->active, 1);
11461146

11471147
error = cpcap_battery_calibrate(ddata);

0 commit comments

Comments
 (0)