Skip to content

Commit a8df7d0

Browse files
jpoimboeIngo Molnar
authored andcommitted
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: a09a6e2 ("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
1 parent 0af2f6b commit a8df7d0

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

tools/objtool/check.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3886,6 +3886,11 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)
38863886
WARN_INSN(insn, "RET before UNTRAIN");
38873887
return 1;
38883888

3889+
case INSN_CONTEXT_SWITCH:
3890+
if (insn_func(insn))
3891+
break;
3892+
return 0;
3893+
38893894
case INSN_NOP:
38903895
if (insn->retpoline_safe)
38913896
return 0;

0 commit comments

Comments
 (0)