]> www.infradead.org Git - users/hch/misc.git/commit
objtool: Fix INSN_CONTEXT_SWITCH handling in validate_unret()
authorJosh Poimboeuf <jpoimboe@kernel.org>
Tue, 8 Apr 2025 07:02:13 +0000 (00:02 -0700)
committerIngo Molnar <mingo@kernel.org>
Tue, 8 Apr 2025 07:14:11 +0000 (09:14 +0200)
commita8df7d0ef92eca28c610206c6748daf537ac0586
tree1dde691d22518d54034b749de08f609439234e15
parent0af2f6be1b4281385b618cb86ad946eded089ac8
objtool: Fix INSN_CONTEXT_SWITCH handling in validate_unret()

The !CONFIG_IA32_EMULATION version of xen_entry_SYSCALL_compat() ends
with a SYSCALL instruction which is classified by objtool as
INSN_CONTEXT_SWITCH.

Unlike validate_branch(), validate_unret() doesn't consider
INSN_CONTEXT_SWITCH in a non-function to be a dead end, so it keeps
going past the end of xen_entry_SYSCALL_compat(), resulting in the
following warning:

  vmlinux.o: warning: objtool: xen_reschedule_interrupt+0x2a: RET before UNTRAIN

Fix that by adding INSN_CONTEXT_SWITCH handling to validate_unret() to
match what validate_branch() is already doing.

Fixes: a09a6e2399ba ("objtool: Add entry UNRET validation")
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/f5eda46fd09f15b1f5cde3d9ae3b92b958342add.1744095216.git.jpoimboe@kernel.org
tools/objtool/check.c