diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2023-04-07 17:16:41 -0700 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-08-17 17:07:09 +0200 |
| commit | c6cfcbd8ca43766851a8c952e3b570727147020f (patch) | |
| tree | f67a704f7078b00d4f6124cee2c455cbaefaf8d8 /arch/x86/kernel/cet.c | |
| parent | c6b53dcec07c842af75123d9b29684bdbd36a407 (diff) | |
| download | linux-c6cfcbd8ca43766851a8c952e3b570727147020f.tar.gz linux-c6cfcbd8ca43766851a8c952e3b570727147020f.tar.bz2 linux-c6cfcbd8ca43766851a8c952e3b570727147020f.zip | |
x86/ibt: Convert IBT selftest to asm
The following warning is reported when frame pointers and kernel IBT are
enabled:
vmlinux.o: warning: objtool: ibt_selftest+0x11: sibling call from callable instruction with modified stack frame
The problem is that objtool interprets the indirect branch in
ibt_selftest() as a sibling call, and GCC inserts a (partial) frame
pointer prologue before it:
0000 000000000003f550 <ibt_selftest>:
0000 3f550: f3 0f 1e fa endbr64
0004 3f554: e8 00 00 00 00 call 3f559 <ibt_selftest+0x9> 3f555: R_X86_64_PLT32 __fentry__-0x4
0009 3f559: 55 push %rbp
000a 3f55a: 48 8d 05 02 00 00 00 lea 0x2(%rip),%rax # 3f563 <ibt_selftest_ip>
0011 3f561: ff e0 jmp *%rax
Note the inline asm is missing ASM_CALL_CONSTRAINT, so the 'push %rbp'
happens before the indirect branch and the 'mov %rsp, %rbp' happens
afterwards.
Simplify the generated code and make it easier to understand for both
tools and humans by moving the selftest to proper asm.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/99a7e16b97bda97bf0a04aa141d6241cd8a839a2.1680912949.git.jpoimboe@kernel.org
Diffstat (limited to 'arch/x86/kernel/cet.c')
| -rw-r--r-- | arch/x86/kernel/cet.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/arch/x86/kernel/cet.c b/arch/x86/kernel/cet.c index cc10d8be9d74..d2c732a34e5d 100644 --- a/arch/x86/kernel/cet.c +++ b/arch/x86/kernel/cet.c @@ -81,9 +81,6 @@ static void do_user_cp_fault(struct pt_regs *regs, unsigned long error_code) static __ro_after_init bool ibt_fatal = true; -/* code label defined in asm below */ -extern void ibt_selftest_ip(void); - static void do_kernel_cp_fault(struct pt_regs *regs, unsigned long error_code) { if ((error_code & CP_EC) != CP_ENDBR) { @@ -91,7 +88,7 @@ static void do_kernel_cp_fault(struct pt_regs *regs, unsigned long error_code) return; } - if (unlikely(regs->ip == (unsigned long)&ibt_selftest_ip)) { + if (unlikely(regs->ip == (unsigned long)&ibt_selftest_noendbr)) { regs->ax = 0; return; } @@ -105,24 +102,6 @@ static void do_kernel_cp_fault(struct pt_regs *regs, unsigned long error_code) BUG(); } -/* Must be noinline to ensure uniqueness of ibt_selftest_ip. */ -noinline bool ibt_selftest(void) -{ - unsigned long ret; - - asm (" lea ibt_selftest_ip(%%rip), %%rax\n\t" - ANNOTATE_RETPOLINE_SAFE - " jmp *%%rax\n\t" - "ibt_selftest_ip:\n\t" - UNWIND_HINT_FUNC - ANNOTATE_NOENDBR - " nop\n\t" - - : "=a" (ret) : : "memory"); - - return !ret; -} - static int __init ibt_setup(char *str) { if (!strcmp(str, "off")) |