58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From de4c79dbea1d23e58752c189586c5f5b751fa142 Mon Sep 17 00:00:00 2001
|
|
From: Borislav Petkov <bp@suse.de>
|
|
Date: Thu, 2 Nov 2017 13:09:26 +0100
|
|
Subject: [PATCH 106/231] x86/entry/64: Shorten TEST instructions
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5754
|
|
|
|
Convert TESTL to TESTB and save 3 bytes per callsite.
|
|
|
|
No functionality change.
|
|
|
|
Signed-off-by: Borislav Petkov <bp@suse.de>
|
|
Cc: Andy Lutomirski <luto@kernel.org>
|
|
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/20171102120926.4srwerqrr7g72e2k@pd.tnic
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
(cherry picked from commit 1e4c4f610f774df6088d7c065b2dd4d22adba698)
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit 2b5cfca36261d4ce45ebfdf2602d65201fa3c780)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/x86/entry/entry_64.S | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
|
|
index 05501c781c20..2491b3b25b9a 100644
|
|
--- a/arch/x86/entry/entry_64.S
|
|
+++ b/arch/x86/entry/entry_64.S
|
|
@@ -620,7 +620,7 @@ GLOBAL(retint_user)
|
|
GLOBAL(swapgs_restore_regs_and_return_to_usermode)
|
|
#ifdef CONFIG_DEBUG_ENTRY
|
|
/* Assert that pt_regs indicates user mode. */
|
|
- testl $3, CS(%rsp)
|
|
+ testb $3, CS(%rsp)
|
|
jnz 1f
|
|
ud2
|
|
1:
|
|
@@ -653,7 +653,7 @@ retint_kernel:
|
|
GLOBAL(restore_regs_and_return_to_kernel)
|
|
#ifdef CONFIG_DEBUG_ENTRY
|
|
/* Assert that pt_regs indicates kernel mode. */
|
|
- testl $3, CS(%rsp)
|
|
+ testb $3, CS(%rsp)
|
|
jz 1f
|
|
ud2
|
|
1:
|
|
--
|
|
2.14.2
|
|
|