[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <lsq.1520823814.205773972@decadent.org.uk>
Date:   Mon, 12 Mar 2018 03:03:34 +0000
From:   Ben Hutchings <ben@...adent.org.uk>
To:     linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC:     akpm@...ux-foundation.org, "Thomas Gleixner" <tglx@...utronix.de>,
        "Dave Hansen" <dave.hansen@...el.com>,
        "Greg KH" <gregkh@...ux-foundation.org>,
        "Jiri Koshina" <jikos@...nel.org>,
        "Andi Lutomirski" <luto@...capital.net>,
        "Kees Cook" <keescook@...gle.com>,
        "Tom Lendacky" <thomas.lendacky@....com>,
        "Paul Turner" <pjt@...gle.com>,
        "Linus Torvalds" <torvalds@...ux-foundation.org>,
        "Peter Zijlstra" <peterz@...radead.org>,
        "Alan Cox" <gnomes@...rguk.ukuu.org.uk>,
        "Tim Chen" <tim.c.chen@...ux.intel.com>,
        "David Woodhouse" <dwmw@...zon.co.uk>,
        "Andi Kleen" <ak@...ux.intel.com>
Subject: [PATCH 3.2 043/104] x86/pti: Rename BUG_CPU_INSECURE to
 BUG_CPU_MELTDOWN
3.2.101-rc1 review patch.  If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <tglx@...utronix.de>
commit de791821c295cc61419a06fe5562288417d1bc58 upstream.
Use the name associated with the particular attack which needs page table
isolation for mitigation.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: David Woodhouse <dwmw@...zon.co.uk>
Cc: Alan Cox <gnomes@...rguk.ukuu.org.uk>
Cc: Jiri Koshina <jikos@...nel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Tim Chen <tim.c.chen@...ux.intel.com>
Cc: Andi Lutomirski  <luto@...capital.net>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Paul Turner <pjt@...gle.com>
Cc: Tom Lendacky <thomas.lendacky@....com>
Cc: Greg KH <gregkh@...ux-foundation.org>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: Kees Cook <keescook@...gle.com>
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801051525300.1724@nanos
[bwh: Backported to 3.2: bug number is different]
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -214,7 +214,7 @@
  */
 #define X86_BUG(x)		(NCAPINTS*32 + (x))
 
-#define X86_BUG_CPU_INSECURE	X86_BUG(0) /* CPU is insecure and needs kernel page table isolation */
+#define X86_BUG_CPU_MELTDOWN	X86_BUG(0) /* CPU is affected by meltdown attack and needs kernel page table isolation */
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -769,7 +769,7 @@ static void __init early_identify_cpu(st
 		this_cpu->c_bsp_init(c);
 
 	if (c->x86_vendor != X86_VENDOR_AMD)
-		setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
+		setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
 }
 
 void __init early_cpu_init(void)
Powered by blists - more mailing lists
 
