linux-kernel - [PATCH] watchdog: only print critical log when the watchdog fails to be stopped

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250126083850.34623-1-liuchao173@huawei.com>
Date: Sun, 26 Jan 2025 11:38:50 +0300
From: Liu Chao <liuchao173@...wei.com>
To: <wim@...ux-watchdog.org>, <linux@...ck-us.net>,
	<linux-watchdog@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: <caihe@...wei.com>, <lixiaokeng@...wei.com>
Subject: [PATCH] watchdog: only print critical log when the watchdog fails to be stopped

Every time the user echoes 0 > /dev/watchdog0, meaningless critical log
is printed.

Signed-off-by: Liu Chao <liuchao173@...wei.com>
---
 drivers/watchdog/watchdog_dev.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index e2bd266b1b5b..0a9d5e6f3a88 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -960,14 +960,15 @@ static int watchdog_release(struct inode *inode, struct file *file)
 	if (!watchdog_active(wdd))
 		err = 0;
 	else if (test_and_clear_bit(_WDOG_ALLOW_RELEASE, &wd_data->status) ||
-		 !(wdd->info->options & WDIOF_MAGICCLOSE))
+		 !(wdd->info->options & WDIOF_MAGICCLOSE)) {
 		err = watchdog_stop(wdd);
+		if (err < 0)
+			pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
+	}
 
 	/* If the watchdog was not stopped, send a keepalive ping */
-	if (err < 0) {
-		pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
+	if (err < 0)
 		watchdog_ping(wdd);
-	}
 
 	watchdog_update_worker(wdd);
 
-- 
2.23.0