]> www.infradead.org Git - users/willy/xarray.git/commitdiff
watchdog: sc520_wdt: Fix possible use-after-free in wdt_turnoff()
authorZou Wei <zou_wei@huawei.com>
Tue, 11 May 2021 07:04:51 +0000 (15:04 +0800)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 21 Jun 2021 06:49:02 +0000 (08:49 +0200)
This module's remove path calls del_timer(). However, that function
does not wait until the timer handler finishes. This means that the
timer handler may still be running after the driver's remove function
has finished, which would result in a use-after-free.

Fix by calling del_timer_sync(), which makes sure the timer handler
has finished, and unable to re-schedule itself.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/1620716691-108460-1-git-send-email-zou_wei@huawei.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/sc520_wdt.c

index e66e6b905964b9e809f3358d8f631e49e303582d..ca65468f4b9ced2b2a251b6e696b30be85714914 100644 (file)
@@ -186,7 +186,7 @@ static int wdt_startup(void)
 static int wdt_turnoff(void)
 {
        /* Stop the timer */
-       del_timer(&timer);
+       del_timer_sync(&timer);
 
        /* Stop the watchdog */
        wdt_config(0);