package/elf2flt: fix text relocations on xtensa
PATCH 1/1 package/elf2flt: fix text relocations on xtensa
elf2flt 2021.08 has changed endianness swapping logic for relocated entries in the text segment. This broke little-endian xtensa FLAT images which now fail to start with the following message:
binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20)
Fix it by restoring old endianness swapping logic for relocated entries in the text segment when building for xtensa.
---
I've tested a couple other prominent candidates, but it looks like only xtensa has this issue. I've submitted pull request to elf2flt with the patch below.
...-elf2flt-xtensa-fix-text-relocations.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch
package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch new file +51 -0
@@ -0,0 +1,51 @@ +From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 29 Nov 2022 17:47:54 -0800 +Subject: [PATCH] xtensa: fix text relocations + +The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") +changed good_32bit_resolved_reloc to not do endianness swapping for +relocated entries in the text segment. This broke little-endian xtensa +FLAT images which after this change fail to start with the following +message: + + binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) + +Fix it by preserving 'update_text' when building for xtensa. + +Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") +Reported-by: Niklas Cassel <[email protected]> +Signed-off-by: Max Filippov <[email protected]> +--- + elf2flt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/elf2flt.c b/elf2flt.c +index b93aecdaced3..cec3f4a22239 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -808,7 +808,20 @@ output_relocs ( + continue; + case R_XTENSA_32: + case R_XTENSA_PLT: +- goto good_32bit_resolved_reloc; ++ if (bfd_big_endian (abs_bfd)) ++ sym_addr = ++ (r_mem[0] << 24) ++ + (r_mem[1] << 16) ++ + (r_mem[2] << 8) ++ + r_mem[3]; ++ else ++ sym_addr = ++ r_mem[0] ++ + (r_mem[1] << 8) ++ + (r_mem[2] << 16) ++ + (r_mem[3] << 24); ++ relocation_needed = 1; ++ break; + default: + goto bad_resolved_reloc; + #else +-- +2.30.2 +
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedMax, All,
On 2022-11-29 18:18 -0800, Max Filippov spake thusly:
Quoted 11 lines
elf2flt 2021.08 has changed endianness swapping logic for relocated entries in the text segment. This broke little-endian xtensa FLAT images which now fail to start with the following message:
binfmt_flat: reloc outside program0x24c80100(0 - 0x6e430/0x56a20)Fix it by restoring old endianness swapping logic for relocated entries in the text segment when building for xtensa.
Reported-by Niklas Cassel <[email protected]>Signed-off-by Max Filippov <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 73 lines
---
I've tested a couple other prominent candidates, but it looks like only xtensa has this issue. I've submitted pull request to elf2flt with the patch below....-elf2flt-xtensa-fix-text-relocations.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patchpackage/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch new file +51
-0@@ -0,0 +1,51 @@ +From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 29 Nov 2022 17:47:54 -0800 +Subject: [PATCH] xtensa: fix text relocations + +The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") +changed good_32bit_resolved_reloc to not do endianness swapping for +relocated entries in the text segment. This broke little-endian xtensa +FLAT images which after this change fail to start with the following +message: + + binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) + +Fix it by preserving 'update_text' when building for xtensa. + +Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") +Reported-by: Niklas Cassel <[email protected]> +Signed-off-by: Max Filippov <[email protected]> +--- + elf2flt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/elf2flt.c b/elf2flt.c +index b93aecdaced3..cec3f4a22239 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -808,7 +808,20 @@ output_relocs ( + continue; + case R_XTENSA_32: + case R_XTENSA_PLT: +- goto good_32bit_resolved_reloc; ++ if (bfd_big_endian (abs_bfd)) ++ sym_addr = ++ (r_mem[0] << 24) ++ + (r_mem[1] << 16) ++ + (r_mem[2] << 8) ++ + r_mem[3]; ++ else ++ sym_addr = ++ r_mem[0] ++ + (r_mem[1] << 8) ++ + (r_mem[2] << 16) ++ + (r_mem[3] << 24); ++ relocation_needed = 1; ++ break; + default: + goto bad_resolved_reloc; + #else +-- +2.30.2 +Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Max" == Max Filippov <[email protected]> writes:
elf2flt 2021.08 has changed endianness swapping logic for relocated entries in the text segment. This broke little-endian xtensa FLAT images which now fail to start with the following message:
binfmt_flat: reloc outside program0x24c80100(0 - 0x6e430/0x56a20)Fix it by restoring old endianness swapping logic for relocated entries in the text segment when building for xtensa.
Quoted 6 lines
Reported-by Niklas Cassel <[email protected]>Signed-off-by Max Filippov <[email protected]>---
I've tested a couple other prominent candidates, but it looks like only xtensa has this issue. I've submitted pull request to elf2flt with the patch below.
Committed to 2022.08.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot