power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 7 Apr 2021 09:19:03 +0000 (17:19 +0800)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Thu, 8 Apr 2021 12:36:08 +0000 (14:36 +0200)
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>
drivers/power/supply/s3c_adc_battery.c

index dc700066d7bc01c1fee239431d94b1546dab9d40..68d31a3bee484382a894e90b531bc14555a56a03 100644 (file)
@@ -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();