power: supply: generic-adc-battery: fix possible use-after-free in gab_remove()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 7 Apr 2021 09:17:06 +0000 (17:17 +0800)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Thu, 8 Apr 2021 12:35:19 +0000 (14:35 +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>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/generic-adc-battery.c

index 0032069..66039c6 100644 (file)
@@ -373,7 +373,7 @@ static int gab_remove(struct platform_device *pdev)
        }
 
        kfree(adc_bat->psy_desc.properties);
-       cancel_delayed_work(&adc_bat->bat_work);
+       cancel_delayed_work_sync(&adc_bat->bat_work);
        return 0;
 }