linux-kernel - [tip:x86/urgent] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels

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: <tip-1c52d859cb2d417e7216d3e56bb7fea88444cec9@git.kernel.org>
Date:   Mon, 19 Dec 2016 03:03:53 -0800
From:   tip-bot for Andy Lutomirski <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     boris.ostrovsky@...cle.com, jgross@...e.com, peterz@...radead.org,
        mingo@...nel.org, bp@...en8.de, tglx@...utronix.de,
        luto@...nel.org, Xen-devel@...ts.xen.org, hmh@....eng.br,
        andrew.cooper3@...rix.com, linux-kernel@...r.kernel.org,
        hpa@...or.com, gnomes@...rguk.ukuu.org.uk, tedheadster@...il.com,
        brgerst@...il.com
Subject: [tip:x86/urgent] x86/asm/32: Make sync_core() handle missing CPUID
 on all 32-bit kernels

Commit-ID:  1c52d859cb2d417e7216d3e56bb7fea88444cec9
Gitweb:     http://git.kernel.org/tip/1c52d859cb2d417e7216d3e56bb7fea88444cec9
Author:     Andy Lutomirski <luto@...nel.org>
AuthorDate: Fri, 9 Dec 2016 10:24:05 -0800
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 19 Dec 2016 11:54:20 +0100

x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels

We support various non-Intel CPUs that don't have the CPUID
instruction, so the M486 test was wrong.  For now, fix it with a big
hammer: handle missing CPUID on all 32-bit CPUs.

Reported-by: One Thousand Gnomes <gnomes@...rguk.ukuu.org.uk>
Signed-off-by: Andy Lutomirski <luto@...nel.org>
Cc: Juergen Gross <jgross@...e.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Matthew Whitehead <tedheadster@...il.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Henrique de Moraes Holschuh <hmh@....eng.br>
Cc: Andrew Cooper <andrew.cooper3@...rix.com>
Cc: Boris Ostrovsky <boris.ostrovsky@...cle.com>
Cc: xen-devel <Xen-devel@...ts.xen.org>
Link: http://lkml.kernel.org/r/685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86/include/asm/processor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 6aa741f..b934871 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -607,7 +607,7 @@ static inline void sync_core(void)
 {
 	int tmp;
 
-#ifdef CONFIG_M486
+#ifdef CONFIG_X86_32
 	/*
 	 * Do a CPUID if available, otherwise do a jump.  The jump
 	 * can conveniently enough be the jump around CPUID.