linux-kernel - [tip: x86/cleanups] x86/EISA: Dereference memory directly instead of using readl()

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] [day] [month] [year] [list]

Message-ID: <172494026261.2215.11601124401069203669.tip-bot2@tip-bot2>
Date: Thu, 29 Aug 2024 14:04:22 -0000
From: "tip-bot2 for Maciej W. Rozycki" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "Maciej W. Rozycki" <macro@...am.me.uk>,
 Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: x86/cleanups] x86/EISA: Dereference memory directly instead of
 using readl()

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     a678164aadbf68d80f7ab79b8bd5cfe3711e42fa
Gitweb:        https://git.kernel.org/tip/a678164aadbf68d80f7ab79b8bd5cfe3711e42fa
Author:        Maciej W. Rozycki <macro@...am.me.uk>
AuthorDate:    Mon, 26 Aug 2024 10:21:47 +01:00
Committer:     Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 29 Aug 2024 15:57:09 +02:00

x86/EISA: Dereference memory directly instead of using readl()

Sparse expect an __iomem pointer, but after converting the EISA probe to
memremap() the pointer is a regular memory pointer. Access it directly
instead.

[ tglx: Converted it to fix the already applied version  ]

Fixes: 80a4da05642c ("x86/EISA: Use memremap() to probe for the EISA BIOS signature")
Signed-off-by: Maciej W. Rozycki <macro@...am.me.uk>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lore.kernel.org/all/alpine.DEB.2.21.2408261015270.30766@angie.orcam.me.uk
---
 arch/x86/kernel/eisa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/eisa.c b/arch/x86/kernel/eisa.c
index 5a4f99a..9535a65 100644
--- a/arch/x86/kernel/eisa.c
+++ b/arch/x86/kernel/eisa.c
@@ -11,13 +11,13 @@

 static __init int eisa_bus_probe(void)
 {
-	void *p;
+	u32 *p;

 	if ((xen_pv_domain() && !xen_initial_domain()) || cc_platform_has(CC_ATTR_GUEST_SEV_SNP))
 		return 0;

 	p = memremap(0x0FFFD9, 4, MEMREMAP_WB);
-	if (p && readl(p) == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24))
+	if (p && *p == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24))
 		EISA_bus = 1;
 	memunmap(p);
 	return 0;