arch/x86/tools/relocs.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: fb1102a09a3b6710ac1e033690f0283696dc94dc
Gitweb: https://git.kernel.org/tip/fb1102a09a3b6710ac1e033690f0283696dc94dc
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Mon, 27 Jan 2025 11:08:14 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Mon, 27 Jan 2025 11:08:14 +01:00
Revert "x86/boot: Reject absolute references in .head.text"
This reverts commit faf0ed487415f76fe4acf7980ce360901f5e1698.
As Linus reported, the hard build failure is entirely unhelpful
in tracking down the bug:
Absolute reference to symbol '.rodata' not permitted in .head.text
... and to add insult to injury, the offending vmlinux gets deleted,
making it hard to figure out what's going on ...
So revert this until a (much) more developer-friendly version
is merged.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/CAHk-=wj7k9nvJn6cpa3-5Ciwn2RGyE605BMkjWE4MqnvC9E92A@mail.gmail.com
---
arch/x86/tools/relocs.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index e937be9..27441e5 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -841,10 +841,10 @@ static int is_percpu_sym(ElfW(Sym) *sym, const char *symname)
static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
const char *symname)
{
- int headtext = !strcmp(sec_name(sec->shdr.sh_info), ".head.text");
unsigned r_type = ELF64_R_TYPE(rel->r_info);
ElfW(Addr) offset = rel->r_offset;
int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
+
if (sym->st_shndx == SHN_UNDEF)
return 0;
@@ -900,12 +900,6 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
break;
}
- if (headtext) {
- die("Absolute reference to symbol '%s' not permitted in .head.text\n",
- symname);
- break;
- }
-
/*
* Relocation offsets for 64 bit kernels are output
* as 32 bits and sign extended back to 64 bits when
© 2016 - 2025 Red Hat, Inc.