]> www.infradead.org Git - users/dwmw2/linux.git/commit
objtool: Only rewrite unconditional retpoline thunk calls
authorPeter Zijlstra <peterz@infradead.org>
Thu, 10 Jun 2021 07:04:29 +0000 (09:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jul 2022 09:26:19 +0000 (11:26 +0200)
commite32542e9ed362bf8ea48941d965495e1593b5cef
treec796ea79e917dfc1173f4d2fa50f511aeb7afcc3
parenta0319253825ebd8c5b19e31902c4f35f85e93285
objtool: Only rewrite unconditional retpoline thunk calls

commit 2d49b721dc18c113d5221f4cf5a6104eb66cb7f2 upstream.

It turns out that the compilers generate conditional branches to the
retpoline thunks like:

  5d5:   0f 85 00 00 00 00       jne    5db <cpuidle_reflect+0x22>
5d7: R_X86_64_PLT32     __x86_indirect_thunk_r11-0x4

while the rewrite can only handle JMP/CALL to the thunks. The result
is the alternative wrecking the code. Make sure to skip writing the
alternatives for conditional branches.

Fixes: 9bc0bb50727c ("objtool/x86: Rewrite retpoline thunk calls")
Reported-by: Lukasz Majczak <lma@semihalf.com>
Reported-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/objtool/arch/x86/decode.c