linux-kernel - [PATCH 5.14 058/432] watchdog: iTCO_wdt: Fix detection of SMI-off case

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20210916155812.757434358@linuxfoundation.org>
Date:   Thu, 16 Sep 2021 17:56:47 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org,
        Mantas Mikulėnas <grawity@...il.com>,
        Jan Kiszka <jan.kiszka@...mens.com>,
        Paolo Bonzini <pbonzini@...hat.com>,
        Guenter Roeck <linux@...ck-us.net>,
        Wim Van Sebroeck <wim@...ux-watchdog.org>
Subject: [PATCH 5.14 058/432] watchdog: iTCO_wdt: Fix detection of SMI-off case

From: Jan Kiszka <jan.kiszka@...mens.com>

commit aec42642d91fc86ddc03e97f0139c6c34ee6b6b1 upstream.

Obviously, the test needs to run against the register content, not its
address.

Fixes: cb011044e34c ("watchdog: iTCO_wdt: Account for rebooting on second timeout")
Cc: stable@...r.kernel.org
Reported-by: Mantas Mikulėnas <grawity@...il.com>
Signed-off-by: Jan Kiszka <jan.kiszka@...mens.com>
Reviewed-by: Paolo Bonzini <pbonzini@...hat.com>
Reviewed-by: Guenter Roeck <linux@...ck-us.net>
Tested-by: Mantas Mikulėnas <grawity@...il.com>
Link: https://lore.kernel.org/r/d84f8e06-f646-8b43-d063-fb11f4827044@siemens.com
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@...ux-watchdog.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
 drivers/watchdog/iTCO_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -362,7 +362,7 @@ static int iTCO_wdt_set_timeout(struct w
 	 * Otherwise, the BIOS generally reboots when the SMI triggers.
 	 */
 	if (p->smi_res &&
-	    (SMI_EN(p) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN))
+	    (inl(SMI_EN(p)) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN))
 		tmrval /= 2;
 
 	/* from the specs: */