Return-path: From: roy.qing.li@gmail.com To: linux-watchdog@vger.kernel.org, wim@iguana.be, linux@roeck-us.net Subject: [PATCH] watchdog: refuse to unload softdog module when its timer is running Date: Thu, 17 Dec 2015 21:30:02 +0800 Message-Id: <1450359002-26577-1-git-send-email-roy.qing.li@gmail.com> List-ID: From: Li RongQing the softdog has static variables which are accessed if its timer is still running after the driver is unloaded. and lead to crash: $modprobe softdog $echo 1 >/dev/watchdog $modprobe -r softdog CPU 20 Unable to handle kernel paging request at virtual address Oops[#1]: CPU: 20 PID: 0 Comm: swapper/20 Not tainted 4.1.13-WR8.0.0.0_standard ... Modules linked in: [last unloaded: softdog] .... Call Trace: [] cascade+0x34/0xb0 [] run_timer_softirq+0x30c/0x368 [] __do_softirq+0x1ec/0x418 [] irq_exit+0x90/0x98 [] plat_irq_dispatch+0xa4/0x140 [] ret_from_irq+0x0/0x4 [] __r4k_wait+0x20/0x40 [] cpu_startup_entry+0x2a0/0x368 [] start_secondary+0x444/0x4d8 add the module ref when timer is running to avoid to unload the softdog module Signed-off-by: Li RongQing Cc: Guenter Roeck --- drivers/watchdog/softdog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index 0dc5e323d..86ce3f9 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -87,6 +87,7 @@ static struct timer_list watchdog_ticktock = static void watchdog_fire(unsigned long data) { + module_put(THIS_MODULE); if (soft_noboot) pr_crit("Triggered - Reboot ignored\n"); else if (soft_panic) { @@ -105,13 +106,16 @@ static void watchdog_fire(unsigned long data) static int softdog_ping(struct watchdog_device *w) { - mod_timer(&watchdog_ticktock, jiffies+(w->timeout*HZ)); + if (!mod_timer(&watchdog_ticktock, jiffies+(w->timeout*HZ))) + __module_get(THIS_MODULE); return 0; } static int softdog_stop(struct watchdog_device *w) { - del_timer(&watchdog_ticktock); + if (del_timer(&watchdog_ticktock)) + module_put(THIS_MODULE); + return 0; } -- 2.1.4