]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
objtool: Fix skip_alt_group() for non-alternative STAC/CLAC
authorJosh Poimboeuf <jpoimboe@kernel.org>
Wed, 29 Oct 2025 19:54:08 +0000 (12:54 -0700)
committerIngo Molnar <mingo@kernel.org>
Sat, 1 Nov 2025 06:43:20 +0000 (07:43 +0100)
commitc44b4b9eeb71f5b0b617abf6fd66d1ef0aab6200
tree6ad00c41efeac41986bcd8cf0ca856209993d4fe
parentba36dd5ee6fd4643ebbf6ee6eefcecf0b07e35c7
objtool: Fix skip_alt_group() for non-alternative STAC/CLAC

If an insn->alt points to a STAC/CLAC instruction, skip_alt_group()
assumes it's part of an alternative ("alt group") as opposed to some
other kind of "alt" such as an exception fixup.

While that assumption may hold true in the current code base, Linus has
an out-of-tree patch which breaks that assumption by replacing the
STAC/CLAC alternatives with raw STAC/CLAC instructions.

Make skip_alt_group() more robust by making sure it's actually an alt
group before continuing.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Fixes: 2d12c6fb7875 ("objtool: Remove ANNOTATE_IGNORE_ALTERNATIVE from CLAC/STAC")
Closes: https://lore.kernel.org/CAHk-=wi6goUT36sR8GE47_P-aVrd5g38=VTRHpktWARbyE-0ow@mail.gmail.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://patch.msgid.link/3d22415f7b8e06a64e0873b21f48389290eeaa49.1761767616.git.jpoimboe@kernel.org
tools/objtool/check.c