Skip to contentSkip to conversation

x86/pti fix for 4.15

GIT PULL Thomas Gleixner 1 participant 1 message Jan 28, 2018 x86

lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest x86-pti-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-pti-for-linus

Remove the ESP/RSP thunks for retpoline as they cannot ever work. Remove them before they show up in a release.

Thanks,

tglx

------------------>
Waiman Long (1):
x86/retpoline: Remove the esp/rsp thunk

 arch/x86/include/asm/asm-prototypes.h | 1 -
 arch/x86/lib/retpoline.S              | 1 -
 2 files changed, 2 deletions(-)
arch/x86/include/asm/asm-prototypes.h +0 -1
index 0927cdc4f946..1908214b9125 100644
@@ -38,5 +38,4 @@ INDIRECT_THUNK(dx)
 INDIRECT_THUNK(si)
 INDIRECT_THUNK(di)
 INDIRECT_THUNK(bp)
-INDIRECT_THUNK(sp)
 #endif /* CONFIG_RETPOLINE */
arch/x86/lib/retpoline.S +0 -1
index dfb2ba91b670..c909961e678a 100644
@@ -36,7 +36,6 @@ GENERATE_THUNK(_ASM_DX)
 GENERATE_THUNK(_ASM_SI)
 GENERATE_THUNK(_ASM_DI)
 GENERATE_THUNK(_ASM_BP)
-GENERATE_THUNK(_ASM_SP)
 #ifdef CONFIG_64BIT
 GENERATE_THUNK(r8)
 GENERATE_THUNK(r9)