From 963f3d1043058c744b5a3c819068f526189d028a Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 28 Apr 2021 19:18:50 +0100 Subject: [PATCH] ANDROID: Realign canary strategy with Mainline 3fb0fdb3bbe7a ("x86/stackprotector/32: Make the canary into a regular percpu variable)" removed the call to: loadsegment(gs, __KERNEL_STACK_CANARY) ... from the hunk of code copied by 6767ebd98b50b ("ANDROID: Setting up GS before calling __restore_processor_state."). So let's remove it from restore_processor_state() too. Fixes: 6767ebd98b50b ("ANDROID: Setting up GS before calling __restore_processor_state."). Signed-off-by: Lee Jones Change-Id: I07be1076f07d7eebe2a3abd82c00505047bf3e17 --- arch/x86/power/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 20263fcf16db..13eab569b869 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -284,7 +284,6 @@ void notrace restore_processor_state(void) wrmsrl(MSR_GS_BASE, saved_context.kernelmode_gs_base); #else loadsegment(fs, __KERNEL_PERCPU); - loadsegment(gs, __KERNEL_STACK_CANARY); #endif #endif __restore_processor_state(&saved_context);