Skip to content

Commit 246f80a

Browse files
stonezdmglaubitz
authored andcommitted
sh: push-switch: Reorder cleanup operations to avoid use-after-free bug
The original code puts flush_work() before timer_shutdown_sync() in switch_drv_remove(). Although we use flush_work() to stop the worker, it could be rescheduled in switch_timer(). As a result, a use-after-free bug can occur. The details are shown below: (cpu 0) | (cpu 1) switch_drv_remove() | flush_work() | ... | switch_timer // timer | schedule_work(&psw->work) timer_shutdown_sync() | ... | switch_work_handler // worker kfree(psw) // free | | psw->state = 0 // use This patch puts timer_shutdown_sync() before flush_work() to mitigate the bugs. As a result, the worker and timer will be stopped safely before the deallocate operations. Fixes: 9f5e8ee ("sh: generic push-switch framework.") Signed-off-by: Duoming Zhou <duoming@zju.edu.cn> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/20230802033737.9738-1-duoming@zju.edu.cn Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
1 parent fb60211 commit 246f80a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/sh/drivers/push-switch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ static int switch_drv_remove(struct platform_device *pdev)
101101
device_remove_file(&pdev->dev, &dev_attr_switch);
102102

103103
platform_set_drvdata(pdev, NULL);
104-
flush_work(&psw->work);
105104
timer_shutdown_sync(&psw->debounce);
105+
flush_work(&psw->work);
106106
free_irq(irq, pdev);
107107

108108
kfree(psw);

0 commit comments

Comments
 (0)