]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
objtool: Make .altinstructions section entry size consistent
authorJoe Lawrence <joe.lawrence@redhat.com>
Sun, 22 Aug 2021 22:50:36 +0000 (18:50 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Oct 2021 07:42:02 +0000 (09:42 +0200)
commita7ce57ca9407dd257915b56acf970e80b6f04515
treeddae6b705c3d4db663db87c5c0991bfbf922c5bc
parent039a68957f818c30575729d09da837a2593d0fb6
objtool: Make .altinstructions section entry size consistent

[ Upstream commit dc02368164bd0ec603e3f5b3dd8252744a667b8a ]

Commit e31694e0a7a7 ("objtool: Don't make .altinstructions writable")
aligned objtool-created and kernel-created .altinstructions section
flags, but there remains a minor discrepency in their use of a section
entry size: objtool sets one while the kernel build does not.

While sh_entsize of sizeof(struct alt_instr) seems intuitive, this small
deviation can cause failures with external tooling (kpatch-build).

Fix this by creating new .altinstructions sections with sh_entsize of 0
and then later updating sec->sh_size as alternatives are added to the
section.  An added benefit is avoiding the data descriptor and buffer
created by elf_create_section(), but previously unused by
elf_add_alternative().

Fixes: 9bc0bb50727c ("objtool/x86: Rewrite retpoline thunk calls")
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20210822225037.54620-2-joe.lawrence@redhat.com
Cc: Andy Lavr <andy.lavr@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/objtool/arch/x86/decode.c