74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
|
From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Niklas Cassel <niklas.cassel@wdc.com>
|
||
|
|
Date: Tue, 9 Aug 2022 21:06:05 +0200
|
||
|
|
Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa,
|
||
|
|
riscv64
|
||
|
|
|
||
|
|
Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs")
|
||
|
|
changed the condition of which input sections that should be included
|
||
|
|
in the .text output section from:
|
||
|
|
((a->flags & (SEC_DATA | SEC_READONLY)) == (SEC_DATA | SEC_READONLY))
|
||
|
|
to:
|
||
|
|
((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
|
||
|
|
(SEC_DATA | SEC_READONLY | SEC_RELOC))
|
||
|
|
|
||
|
|
On ARM, the .eh_frame input section does not have the SEC_RELOC flag
|
||
|
|
set, so this specific change had no effect on ARM.
|
||
|
|
|
||
|
|
However, on e.g. m68k and riscv64, the .eh_frame input section does
|
||
|
|
have the SEC_RELOC flag set, which means that after commit ba379d08bb78
|
||
|
|
("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation
|
||
|
|
data sections were placed in .text output section, instead of .data
|
||
|
|
output section.
|
||
|
|
|
||
|
|
This will result in a fatal error on m68k, xtensa and riscv64:
|
||
|
|
ERROR: text=0x3bab8 overlaps data=0x33f60 ?
|
||
|
|
|
||
|
|
This is because elf2flt cannot append to .text after .data has been
|
||
|
|
appended to.
|
||
|
|
|
||
|
|
Note that the binutils maintainer says that the correct thing is
|
||
|
|
to put read-only relocation data sections in .text:
|
||
|
|
https://sourceware.org/legacy-ml/binutils/2019-10/msg00132.html
|
||
|
|
|
||
|
|
So the proper fix is probably to rewrite elf2flt so that it can append
|
||
|
|
to .text after .data has been appended to (which will require elf2flt
|
||
|
|
to move/relocate everything that has already been appended to .data,
|
||
|
|
since the virtual addresses are contiguous).
|
||
|
|
|
||
|
|
However, for now, add an exception for m68k, xtensa and riscv64
|
||
|
|
(specifically for the problematic input section, .eh_frame), so that we
|
||
|
|
get the same behavior as older elf2flt releases, where we put read-only
|
||
|
|
relocation data in .data, which was working perfectly fine.
|
||
|
|
|
||
|
|
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
|
||
|
|
---
|
||
|
|
elf2flt.c | 11 +++++++++--
|
||
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/elf2flt.c b/elf2flt.c
|
||
|
|
index 9c32f9a..a680c89 100644
|
||
|
|
--- a/elf2flt.c
|
||
|
|
+++ b/elf2flt.c
|
||
|
|
@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb)
|
||
|
|
static bool
|
||
|
|
ro_reloc_data_section_should_be_in_text(asection *s)
|
||
|
|
{
|
||
|
|
- return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
|
||
|
|
- (SEC_DATA | SEC_READONLY | SEC_RELOC);
|
||
|
|
+ if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
|
||
|
|
+ (SEC_DATA | SEC_READONLY | SEC_RELOC)) {
|
||
|
|
+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa)
|
||
|
|
+ if (!strcmp(".eh_frame", s->name))
|
||
|
|
+ return false;
|
||
|
|
+#endif
|
||
|
|
+ return true;
|
||
|
|
+ }
|
||
|
|
+ return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
static uint32_t *
|
||
|
|
--
|
||
|
|
2.37.1
|
||
|
|
|