Skip to contentSkip to conversation

objtools fix for v5.14

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jun 28, 2021 objtool

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest objtool/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git objtool-urgent-2021-06-28

# HEAD: e31694e0a7a709293319475d8001e05e31f2178c objtool: Don't make .altinstructions writable

A single ELF format fix for a section flags mismatch bug that breaks kernel tooling such as kpatch-build.

Thanks,

Ingo

------------------>
Josh Poimboeuf (1):
objtool: Don't make .altinstructions writable

 tools/objtool/arch/x86/decode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/arch/x86/decode.c +1 -1
index 523aa4157f80..bc821056aba9 100644
@@ -684,7 +684,7 @@ static int elf_add_alternative(struct elf *elf,
 	sec = find_section_by_name(elf, ".altinstructions");
 	if (!sec) {
 		sec = elf_create_section(elf, ".altinstructions",
-					 SHF_WRITE, size, 0);
+					 SHF_ALLOC, size, 0);
 
 		if (!sec) {
 			WARN_ELF("elf_create_section");
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 28 Jun 2021 07:50:47 +0200:

The pull request you sent on Mon, 28 Jun 2021 07:50:47 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git objtool-urgent-2021-06-28

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b89c07dea16137696d0f2d479ef665ef7c1022ab

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html