diff options
Diffstat (limited to 'patches/0032-x86-clear-smap-in-cr4-when-not-used.patch')
| -rw-r--r-- | patches/0032-x86-clear-smap-in-cr4-when-not-used.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch index de67e2f..45d941c 100644 --- a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch +++ b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch @@ -1,7 +1,7 @@ From f33db22cf6467e06805aec240ced40916c550492 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Fri, 19 Jun 2020 18:07:53 -0600 -Subject: [PATCH 32/33] x86: clear smap in cr4 when not used +Subject: [PATCH 32/34] x86: clear smap in cr4 when not used If the CPU supports SMAP, but it isn't specified in the config, then we need to explicitly clear it from cr4. Otherwise the processor will trap @@ -17,7 +17,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h -index 476b053ef1c1..990bc6232376 100644 +index 476b053ef1c..990bc623237 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -16,6 +16,12 @@ @@ -43,7 +43,7 @@ index 476b053ef1c1..990bc6232376 100644 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index c33396b4a3e0..e03b532d96ee 100644 +index c33396b4a3e..e03b532d96e 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -449,7 +449,7 @@ static const char * const spectre_v1_strings[] = { @@ -56,7 +56,7 @@ index c33396b4a3e0..e03b532d96ee 100644 /* diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 1970e49705e0..67d6f0c692cf 100644 +index 1970e49705e..67d6f0c692c 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -355,7 +355,11 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) @@ -72,7 +72,7 @@ index 1970e49705e0..67d6f0c692cf 100644 static __always_inline void setup_umip(struct cpuinfo_x86 *c) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index 4698dedc7071..50c04da82508 100644 +index 4698dedc707..50c04da8250 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1207,7 +1207,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, @@ -85,5 +85,5 @@ index 4698dedc7071..50c04da82508 100644 bad_area_nosemaphore(regs, error_code, address, NULL); -- -2.28.0 +2.29.1 |