x86/alternative: Make custom return thunk unconditional

Browse source

Upstream commit: 095b8303f3

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: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Peter Zijlstra 2023-08-14 13:44:30 +02:00 • committed by Greg Kroah-Hartman

parent b012dcf39d

commit 545a94ffc2

3 changed files with 6 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/x86/include/asm/nospec-branch.h

View file

4

arch/x86/kernel/alternative.c

View file

2

arch/x86/kernel/cpu/bugs.c

View file