rtc: 88pm860x: prevent use-after-free on device remove
PATCH 1/1 rtc: 88pm860x: prevent use-after-free on device remove
The device's remove() attempts to shut down the delayed_work scheduled on the kernel-global workqueue by calling flush_scheduled_work().
Unfortunately, flush_scheduled_work() does not prevent the delayed_work from re-scheduling itself. The delayed_work might run after the device has been removed, and touch the already de-allocated info structure. This is a potential use-after-free.
Fix by calling cancel_delayed_work_sync() during remove(): this ensures that the delayed work is properly cancelled, is no longer running, and is not able to re-schedule itself.
This issue was detected with the help of Coccinelle.
--- drivers/rtc/rtc-88pm860x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-88pm860x.c +1 -1
@@ -421,7 +421,7 @@ static int pm860x_rtc_remove(struct platform_device *pdev)struct pm860x_rtc_info *info =platform_get_drvdata (pdev);#ifdef VRTC_CALIBRATION -flush_scheduled_work (); +cancel_delayed_work_sync (&info->calib_work);/* disable measurement */ pm860x_set_bits (info->i2c,PM8607_MEAS_EN2 ,MEAS2_VRTC ,0 );#endif /* VRTC_CALIBRATION */
Signature · 1 line
2.17.1
Quoted 12 lines · Sven Van Asbroeck
The device's
remove()attempts to shut down thedelayed_workscheduled on the kernel-global workqueue by callingflush_scheduled_work().Unfortunately,
flush_scheduled_work()does not prevent thedelayed_workfrom re-scheduling itself. Thedelayed_workmight run after the device has been removed, and touch the already de-allocated info structure. This is a potential use-after-free.Fix by calling
cancel_delayed_work_sync()duringremove(): this ensures that the delayed work is properly cancelled, is no longer running, and is not able to re-schedule itself.
Quoted 7 lines
This issue was detected with the help of Coccinelle.
Signed-off-by Sven Van Asbroeck <[email protected]>--- drivers/rtc/rtc-88pm860x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com