Commit 3580d0b2 authored Nov 21, 2019 by Andy Lutomirski Committed by Peter Zijlstra Nov 21, 2019

x86/doublefault/32: Fix stack canaries in the double fault handler



The double fault TSS was missing GS setup, which is needed for stack
canaries to work.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@kernel.org

parent 922eea2c

arch/x86/kernel/doublefault.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ struct x86_hw_tss doublefault_tss __cacheline_aligned = {
		.ss = __KERNEL_DS,
		.ds = __USER_DS,
		.fs = __KERNEL_PERCPU,
		#ifndef CONFIG_X86_32_LAZY_GS
		.gs = __KERNEL_STACK_CANARY,
		#endif

		.__cr3 = __pa_nodebug(swapper_pg_dir),
		};

Admin message