github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: Realign canary strategy with Mainline

Browse Source 
3fb0fdb3bb ("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 6767ebd98b ("ANDROID: Setting
up GS before calling __restore_processor_state.").

So let's remove it from restore_processor_state() too.

Fixes: 6767ebd98b ("ANDROID: Setting up GS before calling __restore_processor_state.").
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I07be1076f07d7eebe2a3abd82c00505047bf3e17
This commit is contained in:
Lee Jones 2021-04-28 19:18:50 +01:00
parent fe761efda8
commit 963f3d1043
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/power/cpu.c
View File

@ -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);