Skip to contentSkip to conversation

watchdog - v3.6-rc5 Fixes

GIT PULL Wim Van Sebroeck 2 participants 3 messages Sep 20, 2012 – Sep 28, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

It will fix a kdump issue in hpwdt and a possible NULL dereference.

This will update the following files:

 hpwdt.c         |    3 +++
 watchdog_core.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

with these Changes:

commit b232a70a1735c004f9ee6fdf363def527b9234b6

Author: Wei Yongjun <[email protected]>
Date:   Mon Sep 10 12:41:15 2012 +0800

watchdog: move the dereference below the NULL test

The dereference should be moved below the NULL test.

spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)

commit 308b135e4fcc00c80c07e0e04e7afa8edf78583c

Author: Toshi Kani <[email protected]>
Date:   Mon Aug 27 12:52:24 2012 -0600

hpwdt: Fix kdump issue in hpwdt

kdump can be interrupted by watchdog timer when the timer is left activated on the crash kernel. Changed the hpwdt driver to disable watchdog timer at boot-time. This assures that watchdog timer is disabled until /dev/watchdog is opened, and prevents watchdog timer to be left running on the crash kernel.

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================

drivers/watchdog/hpwdt.c +3 -0
index 1eff743..ae60406 100644
@@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
 	hpwdt_timer_reg = pci_mem_addr + 0x70;
 	hpwdt_timer_con = pci_mem_addr + 0x72;
 
+	/* Make sure that timer is disabled until /dev/watchdog is opened */
+	hpwdt_stop();
+
 	/* Make sure that we have a valid soft_margin */
 	if (hpwdt_change_timer(soft_margin))
 		hpwdt_change_timer(DEFAULT_MARGIN);
drivers/watchdog/watchdog_core.c +2 -1
index 6aa46a9..3796434 100644
@@ -128,11 +128,12 @@ EXPORT_SYMBOL_GPL(watchdog_register_device);
 void watchdog_unregister_device(struct watchdog_device *wdd)
 {
 	int ret;
-	int devno = wdd->cdev.dev;
+	int devno;
 
 	if (wdd == NULL)
 		return;
 
+	devno = wdd->cdev.dev;
 	ret = watchdog_dev_unregister(wdd);
 	if (ret)
 		pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);
#1 lore raw
Quoted 90 lines
Quoted 90 lines

-----Original Message-----
From: [email protected] [mailto:linux-watchdog- [email protected]] On Behalf Of Wim Van Sebroeck
Sent: Thursday, September 20, 2012 4:14 AM
To: Linus Torvalds
Cc: Andrew Morton; LKML; Linux Watchdog Mailing List; Wei Yongjun; Toshi Kani
Subject: [GIT PULL REQUEST] watchdog - v3.6-rc5 Fixes

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

It will fix a kdump issue in hpwdt and a possible NULL dereference.

This will update the following files:

 hpwdt.c         |    3 +++
 watchdog_core.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

with these Changes:

commit b232a70a1735c004f9ee6fdf363def527b9234b6

Author: Wei Yongjun <[email protected]>
Date:   Mon Sep 10 12:41:15 2012 +0800

watchdog: move the dereference below the NULL test

The dereference should be moved below the NULL test.

spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)

commit 308b135e4fcc00c80c07e0e04e7afa8edf78583c

Author: Toshi Kani <[email protected]>
Date:   Mon Aug 27 12:52:24 2012 -0600

hpwdt: Fix kdump issue in hpwdt

kdump can be interrupted by watchdog timer when the timer is left activated on the crash kernel. Changed the hpwdt driver to disable watchdog timer at boot-time. This assures that watchdog timer is disabled until /dev/watchdog is opened, and prevents watchdog timer to be left running on the crash kernel.

For completeness, I added the overal diff below.

Greetings,
Wim.

========================================================
========================

drivers/watchdog/hpwdt.c +3 -0
index 1eff743..ae60406 100644
@@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
 	hpwdt_timer_reg = pci_mem_addr + 0x70;
 	hpwdt_timer_con = pci_mem_addr + 0x72;
 
+	/* Make sure that timer is disabled until /dev/watchdog is opened */
+	hpwdt_stop();
+
 	/* Make sure that we have a valid soft_margin */
 	if (hpwdt_change_timer(soft_margin))
 		hpwdt_change_timer(DEFAULT_MARGIN);
drivers/watchdog/watchdog_core.c +1 -1
index 6aa46a9..3796434 100644
@@ -128,11 +128,12 @@ EXPORT_SYMBOL_GPL(watchdog_register_device);
 void watchdog_unregister_device(struct watchdog_device *wdd)
 {
 	int ret;
-	int devno = wdd->cdev.dev;
+	int devno;
 
 	if (wdd == NULL)
 		return;
 
Quoted 8 lines
Quoted 8 lines
drivers/watchdog/watchdog_core.c +1 -1
+	devno = wdd->cdev.dev;
 	ret = watchdog_dev_unregister(wdd);
 	if (ret)
 		pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);
--

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

Wim,

Could you take the watchdog davinci patch as well? http://www.mail-archive.com/[email protected]/msg23630.html

I have tried 2 times to send the patch to the linux-watchdog list, but the server is rejecting it for some reason. The second time I tried registering my email id to the list and re-sent, but no success.

Murali
--
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

#2 lore raw

Hi Murali,

Quoted 7 lines

Wim,

Could you take the watchdog davinci patch as well? http://www.mail-archive.com/[email protected]/msg23630.html

I have tried 2 times to send the patch to the linux-watchdog list, but the server is rejecting it for some reason. The second time I tried registering my email id to the list and re-sent, but no success.

Murali

It's in linux-watchdog-next since yesterday-evening.

Kind regards,
Wim.