62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
|
From d4b1f2361974bfffa04a528fb2ad393a55d13841 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andy Lutomirski <luto@kernel.org>
|
||
|
|
Date: Thu, 2 Nov 2017 00:59:03 -0700
|
||
|
|
Subject: [PATCH 091/231] x86/entry/64: Use pop instead of movq in
|
||
|
|
syscall_return_via_sysret
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2017-5754
|
||
|
|
|
||
|
|
Saves 64 bytes.
|
||
|
|
|
||
|
|
Signed-off-by: Andy Lutomirski <luto@kernel.org>
|
||
|
|
Reviewed-by: Borislav Petkov <bp@suse.de>
|
||
|
|
Cc: Borislav Petkov <bpetkov@suse.de>
|
||
|
|
Cc: Brian Gerst <brgerst@gmail.com>
|
||
|
|
Cc: Dave Hansen <dave.hansen@intel.com>
|
||
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
||
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Link: http://lkml.kernel.org/r/6609b7f74ab31c36604ad746e019ea8495aec76c.1509609304.git.luto@kernel.org
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||
|
|
(cherry picked from commit 4fbb39108f972437c44e5ffa781b56635d496826)
|
||
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
||
|
|
(cherry picked from commit 1e9a9d5ef9f65eeb26eb8f0974dd3e693894baf1)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
arch/x86/entry/entry_64.S | 14 +++++++++++---
|
||
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
|
||
|
|
index 6995f7e08aa1..33a416c7df2d 100644
|
||
|
|
--- a/arch/x86/entry/entry_64.S
|
||
|
|
+++ b/arch/x86/entry/entry_64.S
|
||
|
|
@@ -315,10 +315,18 @@ return_from_SYSCALL_64:
|
||
|
|
*/
|
||
|
|
syscall_return_via_sysret:
|
||
|
|
/* rcx and r11 are already restored (see code above) */
|
||
|
|
- RESTORE_EXTRA_REGS
|
||
|
|
- RESTORE_C_REGS_EXCEPT_RCX_R11
|
||
|
|
- movq RSP(%rsp), %rsp
|
||
|
|
UNWIND_HINT_EMPTY
|
||
|
|
+ POP_EXTRA_REGS
|
||
|
|
+ popq %rsi /* skip r11 */
|
||
|
|
+ popq %r10
|
||
|
|
+ popq %r9
|
||
|
|
+ popq %r8
|
||
|
|
+ popq %rax
|
||
|
|
+ popq %rsi /* skip rcx */
|
||
|
|
+ popq %rdx
|
||
|
|
+ popq %rsi
|
||
|
|
+ popq %rdi
|
||
|
|
+ movq RSP-ORIG_RAX(%rsp), %rsp
|
||
|
|
USERGS_SYSRET64
|
||
|
|
END(entry_SYSCALL_64)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|