]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/alternative: Make custom return thunk unconditional
authorPeter Zijlstra <peterz@infradead.org>
Mon, 14 Aug 2023 11:44:30 +0000 (13:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Aug 2023 12:23:38 +0000 (14:23 +0200)
commit08f7cfd44f77b2796582bc26164fdef44dd33b6c
treec2e5a448964f59a8bda6c0224b159345bd9b089f
parent0d810eff090c30535f5cb8db6a6cfbaed7aa499a
x86/alternative: Make custom return thunk unconditional

commit 095b8303f3835c68ac4a8b6d754ca1c3b6230711 upstream.

There is infrastructure to rewrite return thunks to point to any
random thunk one desires, unwrap that from CALL_THUNKS, which up to
now was the sole user of that.

  [ bp: Make the thunks visible on 32-bit and add ifdeffery for the
    32-bit builds. ]

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230814121148.775293785@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/include/asm/nospec-branch.h
arch/x86/kernel/cpu/bugs.c