summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-04-07 11:19:03 +0200
committerSebastian Reichel <sebastian.reichel@collabora.com>2021-04-08 14:36:08 +0200
commit68ae256945d2abe9036a7b68af4cc65aff79d5b7 (patch)
tree4f77a136af48a64057ebe186101692f4fe0564ef /drivers/power
parentpower: supply: generic-adc-battery: fix possible use-after-free in gab_remove() (diff)
downloadlinux-68ae256945d2abe9036a7b68af4cc65aff79d5b7.tar.xz
linux-68ae256945d2abe9036a7b68af4cc65aff79d5b7.zip
power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This means that the callback function may still be running after the driver's remove function has finished, which would result in a use-after-free. Fix by calling cancel_delayed_work_sync(), which ensures that the work is properly cancelled, no longer running, and unable to re-schedule itself. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/s3c_adc_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/s3c_adc_battery.c b/drivers/power/supply/s3c_adc_battery.c
index dc700066d7bc..68d31a3bee48 100644
--- a/drivers/power/supply/s3c_adc_battery.c
+++ b/drivers/power/supply/s3c_adc_battery.c
@@ -390,7 +390,7 @@ static int s3c_adc_bat_remove(struct platform_device *pdev)
if (main_bat.charge_finished)
free_irq(gpiod_to_irq(main_bat.charge_finished), NULL);
- cancel_delayed_work(&bat_work);
+ cancel_delayed_work_sync(&bat_work);
if (pdata->exit)
pdata->exit();