Skip to content

Commit b750812

Browse files
whamesre
authored andcommitted
power: supply: pm8916_lbc: 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: f8d7a3d ("power: supply: Add driver for pm8916 lbc") Signed-off-by: Waqar Hameed <waqar.hameed@axis.com> Reviewed-by: Nikita Travkin <nikita@trvn.ru> Link: https://patch.msgid.link/64d8dd3675a4e59fa32c3e0ef451f12d1f7ed18f.1766268280.git.waqar.hameed@axis.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 6291495 commit b750812

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/power/supply/pm8916_lbc.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,6 @@ static int pm8916_lbc_charger_probe(struct platform_device *pdev)
274274
return dev_err_probe(dev, -EINVAL,
275275
"Wrong amount of reg values: %d (4 expected)\n", len);
276276

277-
irq = platform_get_irq_byname(pdev, "usb_vbus");
278-
if (irq < 0)
279-
return irq;
280-
281-
ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_lbc_charger_state_changed_irq,
282-
IRQF_ONESHOT, "pm8916_lbc", chg);
283-
if (ret)
284-
return ret;
285-
286277
ret = device_property_read_u32_array(dev, "reg", chg->reg, len);
287278
if (ret)
288279
return ret;
@@ -332,6 +323,15 @@ static int pm8916_lbc_charger_probe(struct platform_device *pdev)
332323
if (ret)
333324
return dev_err_probe(dev, ret, "Unable to get battery info\n");
334325

326+
irq = platform_get_irq_byname(pdev, "usb_vbus");
327+
if (irq < 0)
328+
return irq;
329+
330+
ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_lbc_charger_state_changed_irq,
331+
IRQF_ONESHOT, "pm8916_lbc", chg);
332+
if (ret)
333+
return ret;
334+
335335
chg->edev = devm_extcon_dev_allocate(dev, pm8916_lbc_charger_cable);
336336
if (IS_ERR(chg->edev))
337337
return PTR_ERR(chg->edev);

0 commit comments

Comments
 (0)