diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-21 00:40:24 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2019-11-21 19:37:43 +0100 |
| commit | 880a98c339961eaa074393e3a2117cbe9125b8bb (patch) | |
| tree | e7730f252db8af6007070060c9b2c8a3394b9110 /arch/x86 | |
| parent | f490e07c53d66045d9d739e134145ec9b38653d3 (diff) | |
| download | linux-880a98c339961eaa074393e3a2117cbe9125b8bb.tar.bz2 | |
x86/cpu_entry_area: Add guard page for entry stack on 32bit
The entry stack in the cpu entry area is protected against overflow by the
readonly GDT on 64-bit, but on 32-bit the GDT needs to be writeable and
therefore does not trigger a fault on stack overflow.
Add a guard page.
Fixes: c482feefe1ae ("x86/entry/64: Make cpu_entry_area.tss read-only")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@kernel.org
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/cpu_entry_area.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpu_entry_area.h b/arch/x86/include/asm/cpu_entry_area.h index 8348f7d69fd5..905d89c80d3f 100644 --- a/arch/x86/include/asm/cpu_entry_area.h +++ b/arch/x86/include/asm/cpu_entry_area.h @@ -78,8 +78,12 @@ struct cpu_entry_area { /* * The GDT is just below entry_stack and thus serves (on x86_64) as - * a a read-only guard page. + * a read-only guard page. On 32-bit the GDT must be writeable, so + * it needs an extra guard page. */ +#ifdef CONFIG_X86_32 + char guard_entry_stack[PAGE_SIZE]; +#endif struct entry_stack_page entry_stack_page; /* |