Skip to content

Commit

Permalink
watchdog: sc520_wdt: Fix possible use-after-free in wdt_turnoff()
Browse files Browse the repository at this point in the history
[ Upstream commit 90b7c14 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
SamuelZOU authored and gregkh committed Jul 20, 2021
1 parent a397cb4 commit a173e3b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/sc520_wdt.c
Expand Up @@ -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);
Expand Down

0 comments on commit a173e3b

Please sign in to comment.