Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2018-01-09 14:35:46 +0100
committerJiri Slaby <jslaby@suse.cz>2018-01-09 14:48:04 +0100
commit05663637fe8f0f540e7bd94df3c9ae0d5a9c6373 (patch)
tree3bca68336b7ab4c880ecf3916d3db30977bcfdad
parentb79354a5baf4d178b5678b12dda2f3e6b33d20e1 (diff)
- Refresh
patches.suse/0007-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch. - Refresh patches.suse/0013-x86-entry-Stuff-RSB-for-entry-to-kernel-for-non-SMEP.patch. - Refresh patches.suse/0015-x86-syscall-Clear-unused-extra-registers-on-32-bit-c.patch. Fix double fault in 32bit binaries (bnc#1074869, bnc#1074918, bnc#1074920, bnc#1074921, bnc#1075018, bnc#1075034) suse-commit: f4b3cf0d7fc3f44dad4f198c1b1725bac93a6625
-rw-r--r--arch/x86/entry/entry_64_compat.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index d6ee6a5be7d7..9375be1a28ef 100644
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -201,8 +201,6 @@ ENTRY(entry_SYSCALL_compat)
/* Use %rsp as scratch reg. User ESP is stashed in r8 */
SWITCH_TO_KERNEL_CR3 scratch_reg=%rsp
- ENABLE_IBRS_CLOBBER
- STUFF_RSB
/* Switch to the kernel stack */
movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
@@ -234,6 +232,9 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe)
CLEAR_R8_TO_R15
+ ENABLE_IBRS_CLOBBER
+ STUFF_RSB
+
/*
* User mode is traced as though IRQs are on, and SYSENTER
* turned them off.