watchdog: refuse to unload softdog module when its timer is running
PATCH 1/1 watchdog: refuse to unload softdog module when its timer is running
From: Li RongQing <[email protected]>
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:
[<ffffffff801e142c>] cascade+0x34/0xb0
[<ffffffff801e1964>] run_timer_softirq+0x30c/0x368
[<ffffffff80181044>] __do_softirq+0x1ec/0x418
[<ffffffff801815d0>] irq_exit+0x90/0x98
[<ffffffff8010749c>] plat_irq_dispatch+0xa4/0x140
[<ffffffff80152740>] ret_from_irq+0x0/0x4
[<ffffffff801529e0>] __r4k_wait+0x20/0x40
[<ffffffff801c2278>] cpu_startup_entry+0x2a0/0x368
[<ffffffff8015fa64>] start_secondary+0x444/0x4d8add the module ref when timer is running to avoid to unload the softdog module
--- drivers/watchdog/softdog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/watchdog/softdog.c +6 -2
@@ -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 ; }
Signature · 1 line
2.1.4
Guenter Roeck
maintainerQuoted 40 lines · On 12/17/2015 05:30 AM, [email protected] wrote:
From: Li RongQing <[email protected]>
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: [<ffffffff801e142c>] cascade+0x34/0xb0 [<ffffffff801e1964>] run_timer_softirq+0x30c/0x368 [<ffffffff80181044>] __do_softirq+0x1ec/0x418 [<ffffffff801815d0>] irq_exit+0x90/0x98 [<ffffffff8010749c>] plat_irq_dispatch+0xa4/0x140 [<ffffffff80152740>] ret_from_irq+0x0/0x4 [<ffffffff801529e0>] __r4k_wait+0x20/0x40 [<ffffffff801c2278>] cpu_startup_entry+0x2a0/0x368 [<ffffffff8015fa64>] start_secondary+0x444/0x4d8add the module ref when timer is running to avoid to unload the softdog module
Signed-off-by Li RongQing <[email protected]>Cc Guenter Roeck <[email protected]>--- drivers/watchdog/softdog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/watchdog/softdog.c +0
-0
drivers/watchdog/softdog.c static struct timer_list watchdog_ticktock = · line 90
Quoted 4 lines
drivers/watchdog/softdog.c +1
-0@@ -87,6 +87,7 @@ static struct timer_list watchdog_ticktock =static void watchdog_fire (unsigned long data) { +module_put (THIS_MODULE );
Don't bother with module_put() here.
Guenter
Quoted 23 lines
drivers/watchdog/softdog.c +5
-2if (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 ; }
Quoted 1 line · Guenter Roeck
Don't bother with
module_put()here.
I think this is needed;
the softdog supported soft_noreboot "Softdog action, set to 1 to ignore reboots, 0 to reboot (default=0)"
if soft_noreboot is 1, and not call module_put(THIS_MODULE) in watchdog_fire, softdog module ref count is leaked, and softdog will not be unload
-Roy
Guenter Roeck
maintainerQuoted 11 lines · Li RongQing
Quoted 1 line · Guenter Roeck
Don't bother with
module_put()here.I think this is needed;
the softdog supported
soft_noreboot"Softdog action, set to 1 to ignore reboots, 0 to reboot (default=0)"
ifsoft_norebootis 1, and not callmodule_put(THIS_MODULE)inwatchdog_fire, softdog module ref count is leaked, and softdog will not be unload
Good point.
Guenter
Quoted 6 lines
-Roy
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 26 lines · On 12/17/2015 05:30 AM, [email protected] wrote:
From: Li RongQing <[email protected]>
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: [<ffffffff801e142c>] cascade+0x34/0xb0 [<ffffffff801e1964>] run_timer_softirq+0x30c/0x368 [<ffffffff80181044>] __do_softirq+0x1ec/0x418 [<ffffffff801815d0>] irq_exit+0x90/0x98 [<ffffffff8010749c>] plat_irq_dispatch+0xa4/0x140 [<ffffffff80152740>] ret_from_irq+0x0/0x4 [<ffffffff801529e0>] __r4k_wait+0x20/0x40 [<ffffffff801c2278>] cpu_startup_entry+0x2a0/0x368 [<ffffffff8015fa64>] start_secondary+0x444/0x4d8
Quoted 5 lines
add the module ref when timer is running to avoid to unload the softdog module
Signed-off-by Li RongQing <[email protected]>Cc Guenter Roeck <[email protected]>
Quoted 36 lines
--- drivers/watchdog/softdog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/watchdog/softdog.c +6
-2@@ -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 ; }
Hi Li,
Quoted 69 lines
From: Li RongQing <[email protected]>
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: [<ffffffff801e142c>] cascade+0x34/0xb0 [<ffffffff801e1964>] run_timer_softirq+0x30c/0x368 [<ffffffff80181044>] __do_softirq+0x1ec/0x418 [<ffffffff801815d0>] irq_exit+0x90/0x98 [<ffffffff8010749c>] plat_irq_dispatch+0xa4/0x140 [<ffffffff80152740>] ret_from_irq+0x0/0x4 [<ffffffff801529e0>] __r4k_wait+0x20/0x40 [<ffffffff801c2278>] cpu_startup_entry+0x2a0/0x368 [<ffffffff8015fa64>] start_secondary+0x444/0x4d8add the module ref when timer is running to avoid to unload the softdog module
Signed-off-by Li RongQing <[email protected]>Cc Guenter Roeck <[email protected]>--- drivers/watchdog/softdog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/watchdog/softdog.c +6
-2@@ -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 ; }Signature · 1 line
2.1.4
Patch is adde to linux-watchdog-next.
Kind regards,
Wim.