[PATCH 5/5] RISC-V: check relocation fields during relaxation
Harshit Kumar
harshit7kr@gmail.com
Tue Nov 10 20:15:22 GMT 2026
Relaxation runs before riscv_elf_relocate_section. Relocation bounds
checks in the final link loop do not protect relaxation passes.
Relaxation helpers read and write fields at rel->r_offset. Previously,
these helpers relied on BFD_ASSERT. The default assert handler logs an
error and continues execution out of bounds.
Replace assertions in relaxation helpers with riscv_relax_field_in_range.
Validate offsets against the dynamic section size sec->size.
In _bfd_riscv_relax_align, writes plus deletes never exceed
rel->r_addend octets. Checking that span against sec->size is
sufficient.
Check deleted ranges for R_RISCV_DELETE against sec->size and subsequent
deletion offsets in riscv_relax_resolve_delete_relocs.
Crafted input with an R_RISCV_DELETE ending exactly at the section end
can also hit a NULL symbol table dereference in
_riscv_relax_delete_bytes when local symbols are omitted. That is a
separate, existing problem, and this patch does not change it.
bfd/
PR ld/34987
* elfnn-riscv.c (riscv_relax_field_in_range): New function.
(riscv_relax_resolve_delete_relocs): Check deleted range against
sec->size and subsequent deletion offsets.
(_bfd_riscv_relax_call): Check eight-octet instruction span.
(_bfd_riscv_relax_jal): Check instruction span before reading.
(_bfd_riscv_relax_lui): Check instruction span.
(_bfd_riscv_relax_tls_le): Likewise.
(_bfd_riscv_relax_tlsdesc): Likewise.
(_bfd_riscv_relax_align): Check NOP sequence span.
(_bfd_riscv_relax_pc): Check instruction span.
ld/
PR ld/34987
* testsuite/ld-riscv-elf/riscv-reloc-offset.exp: Add R_RISCV_DELETE
and R_RISCV_ALIGN cases.
* testsuite/ld-riscv-elf/delete-boundary.s: New file.
* testsuite/ld-riscv-elf/delete-end.s: New file.
* testsuite/ld-riscv-elf/align-zero.s: New file.
* testsuite/ld-riscv-elf/relax-*-bounds*: New tests.
* testsuite/ld-riscv-elf/relax-call-section-end.*: New test.
* testsuite/ld-riscv-elf/relax-marker-end.*: New test.
* testsuite/ld-riscv-elf/deferred-delete.*: New test.
* testsuite/ld-riscv-elf/ld-riscv-elf.exp: Run them.
Signed-off-by: Harshit Kumar <harshit7kr@gmail.com>
---
bfd/elfnn-riscv.c | 67 ++++++++--
ld/testsuite/ld-riscv-elf/align-zero.s | 5 +
ld/testsuite/ld-riscv-elf/deferred-delete.d | 20 +++
ld/testsuite/ld-riscv-elf/deferred-delete.s | 11 ++
ld/testsuite/ld-riscv-elf/delete-boundary.s | 7 +
ld/testsuite/ld-riscv-elf/delete-end.s | 5 +
ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp | 12 ++
.../ld-riscv-elf/relax-align-bounds-control.d | 18 +++
.../ld-riscv-elf/relax-align-bounds-pass.s | 15 +++
.../ld-riscv-elf/relax-align-bounds.d | 5 +
.../ld-riscv-elf/relax-align-bounds.s | 6 +
.../ld-riscv-elf/relax-call-bounds-control.d | 13 ++
.../ld-riscv-elf/relax-call-bounds-pass.s | 6 +
ld/testsuite/ld-riscv-elf/relax-call-bounds.d | 5 +
ld/testsuite/ld-riscv-elf/relax-call-bounds.s | 6 +
.../ld-riscv-elf/relax-call-section-end.d | 20 +++
.../ld-riscv-elf/relax-call-section-end.s | 9 ++
ld/testsuite/ld-riscv-elf/relax-jal-bounds.d | 5 +
ld/testsuite/ld-riscv-elf/relax-jal-bounds.s | 8 ++
ld/testsuite/ld-riscv-elf/relax-lui-bounds.d | 5 +
ld/testsuite/ld-riscv-elf/relax-lui-bounds.s | 7 +
ld/testsuite/ld-riscv-elf/relax-marker-end.d | 10 ++
ld/testsuite/ld-riscv-elf/relax-marker-end.s | 5 +
.../ld-riscv-elf/relax-pcrel-bounds.d | 5 +
.../ld-riscv-elf/relax-pcrel-bounds.s | 7 +
.../ld-riscv-elf/relax-tls-le-bounds.d | 5 +
.../ld-riscv-elf/relax-tls-le-bounds.s | 7 +
.../ld-riscv-elf/relax-tlsdesc-bounds.d | 5 +
.../ld-riscv-elf/relax-tlsdesc-bounds.s | 7 +
.../ld-riscv-elf/riscv-reloc-offset.exp | 123 +++++++++++++++++-
30 files changed, 418 insertions(+), 11 deletions(-)
create mode 100644 ld/testsuite/ld-riscv-elf/align-zero.s
create mode 100644 ld/testsuite/ld-riscv-elf/deferred-delete.d
create mode 100644 ld/testsuite/ld-riscv-elf/deferred-delete.s
create mode 100644 ld/testsuite/ld-riscv-elf/delete-boundary.s
create mode 100644 ld/testsuite/ld-riscv-elf/delete-end.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-align-bounds-control.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-align-bounds-pass.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-align-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-align-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-bounds-control.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-bounds-pass.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-section-end.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-call-section-end.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-jal-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-jal-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-lui-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-lui-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-marker-end.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-marker-end.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.s
create mode 100644 ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.d
create mode 100644 ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.s
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index c06fa0f52c..a0529763af 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -2514,6 +2514,21 @@ riscv_reloc_field_in_range (bfd *abfd, asection *sec, bfd_vma offset,
return true;
}
+/* Return true if a field of SIZE bytes at OFFSET lies inside SEC during
+ relaxation, checking against SEC->SIZE (which shrinks as bytes are
+ deleted). */
+
+static bool
+riscv_relax_field_in_range (asection *sec, bfd_vma offset, bfd_vma size)
+{
+ if (offset > sec->size || size > sec->size - offset)
+ {
+ riscv_bad_reloc_offset (sec->owner, sec, offset, size, sec->size, true);
+ return false;
+ }
+ return true;
+}
+
/* Emplace a static relocation. */
static bfd_reloc_status_type
@@ -5160,6 +5175,26 @@ riscv_relax_resolve_delete_relocs (bfd *abfd,
}
bfd_vma toaddr = rel_next == NULL ? sec->size : rel_next->r_offset;
+ if (rel->r_offset > toaddr
+ || (bfd_vma) rel->r_addend > toaddr - rel->r_offset)
+ {
+ if (rel_next == NULL)
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB: bad R_RISCV_DELETE range (%#" PRIx64 " + %#" PRIx64
+ " > %#" PRIx64 ") in section `%pA'"),
+ abfd, (uint64_t) rel->r_offset, (uint64_t) rel->r_addend,
+ (uint64_t) toaddr, sec);
+ else
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB: overlapping R_RISCV_DELETE (%#" PRIx64 " + %#" PRIx64
+ " > %#" PRIx64 ") in section `%pA'"),
+ abfd, (uint64_t) rel->r_offset, (uint64_t) rel->r_addend,
+ (uint64_t) toaddr, sec);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ }
if (!_riscv_relax_delete_bytes (abfd, sec, rel->r_offset, rel->r_addend,
link_info, NULL, delete_total, toaddr))
return false;
@@ -5231,7 +5266,8 @@ _bfd_riscv_relax_call (bfd *abfd, asection *sec, asection *sym_sec,
return true;
/* Shorten the function call. */
- BFD_ASSERT (rel->r_offset + 8 <= sec->size);
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, 8))
+ return false;
auipc = bfd_getl32 (contents + rel->r_offset);
jalr = bfd_getl32 (contents + rel->r_offset + 4);
@@ -5297,6 +5333,9 @@ _bfd_riscv_relax_jal (bfd *abfd, asection *sec, asection *sym_sec,
if (!rvc)
return true;
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, RISCV_INSN_LEN))
+ return false;
+
bfd_vma jal = bfd_getl32 (contents + rel->r_offset);
int rd = (jal >> OP_SH_RD) & OP_MASK_RD;
@@ -5320,10 +5359,7 @@ _bfd_riscv_relax_jal (bfd *abfd, asection *sec, asection *sym_sec,
if (!VALID_CJTYPE_IMM (foff))
return true;
- /* Shorten the jump. */
- BFD_ASSERT (rel->r_offset + 4 <= sec->size);
-
- /* Relax to C.J[AL] rd, addr. */
+ /* Shorten the jump: relax to C.J[AL] rd, addr. */
int r_type = R_RISCV_RVC_JUMP;
bfd_vma insn = (rd == 0) ? MATCH_C_J : MATCH_C_JAL;
@@ -5392,7 +5428,8 @@ _bfd_riscv_relax_lui (bfd *abfd,
: ELF_MAXPAGESIZE;
int use_rvc = elf_elfheader (abfd)->e_flags & EF_RISCV_RVC;
- BFD_ASSERT (rel->r_offset + 4 <= sec->size);
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, RISCV_INSN_LEN))
+ return false;
if (!undefined_weak && gp)
{
@@ -5511,7 +5548,8 @@ _bfd_riscv_relax_tls_le (bfd *abfd,
if (RISCV_CONST_HIGH_PART (tpoff (link_info, symval)) != 0)
return true;
- BFD_ASSERT (rel->r_offset + 4 <= sec->size);
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, RISCV_INSN_LEN))
+ return false;
switch (ELFNN_R_TYPE (rel->r_info))
{
case R_RISCV_TPREL_LO12_I:
@@ -5550,7 +5588,8 @@ _bfd_riscv_relax_tlsdesc (bfd *abfd,
riscv_pcgp_relocs *pcgp_relocs,
bool undefined_weak)
{
- BFD_ASSERT (rel->r_offset + 4 <= sec->size);
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, RISCV_INSN_LEN))
+ return false;
BFD_ASSERT (bfd_link_executable (link_info));
riscv_pcgp_hi_reloc *hi = NULL;
bool local_exec;
@@ -5655,6 +5694,15 @@ _bfd_riscv_relax_align (bfd *abfd, asection *sec,
{
bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
bfd_vma alignment = 1, pos;
+
+ /* The NOP sequence spans rel->r_addend bytes: up to nop_bytes are
+ re-written with NOPs, and the remaining (rel->r_addend - nop_bytes)
+ are deleted. The entire span [offset, offset + addend) must lie
+ within the section. */
+ if (!riscv_relax_field_in_range (sec, rel->r_offset,
+ (bfd_vma) rel->r_addend))
+ return false;
+
while (alignment <= rel->r_addend)
alignment *= 2;
@@ -5723,7 +5771,8 @@ _bfd_riscv_relax_pc (bfd *abfd ATTRIBUTE_UNUSED,
? ELF_MAXPAGESIZE + ELF_COMMONPAGESIZE
: ELF_MAXPAGESIZE;
- BFD_ASSERT (rel->r_offset + 4 <= sec->size);
+ if (!riscv_relax_field_in_range (sec, rel->r_offset, RISCV_INSN_LEN))
+ return false;
/* Chain the _LO relocs to their cooresponding _HI reloc to compute the
actual target address. */
diff --git a/ld/testsuite/ld-riscv-elf/align-zero.s b/ld/testsuite/ld-riscv-elf/align-zero.s
new file mode 100644
index 0000000000..f7e7b09c2e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/align-zero.s
@@ -0,0 +1,5 @@
+ .text
+ .globl _start
+_start:
+ .word 0
+ .reloc 0, R_RISCV_32, 0
diff --git a/ld/testsuite/ld-riscv-elf/deferred-delete.d b/ld/testsuite/ld-riscv-elf/deferred-delete.d
new file mode 100644
index 0000000000..3339bf6786
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/deferred-delete.d
@@ -0,0 +1,20 @@
+#name: RISC-V multiple deferred deletions (toaddr validation)
+#source: deferred-delete.s
+#ld: --relax -e _start
+#objdump: -d
+#target: riscv*-*-*
+
+.*: file format elf.*-.*riscv.*
+
+Disassembly of section \.text:
+
+[0-9a-f]+ <_start>:
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+jal[ ]+[0-9a-f]+ <target1>
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+jal[ ]+[0-9a-f]+ <target2>
+[ ]+[0-9a-f]+:[ ]+00000013[ ]+nop
+
+[0-9a-f]+ <target1>:
+[ ]+[0-9a-f]+:[ ]+00008067[ ]+ret
+
+[0-9a-f]+ <target2>:
+[ ]+[0-9a-f]+:[ ]+00008067[ ]+ret
diff --git a/ld/testsuite/ld-riscv-elf/deferred-delete.s b/ld/testsuite/ld-riscv-elf/deferred-delete.s
new file mode 100644
index 0000000000..e05bbc5d40
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/deferred-delete.s
@@ -0,0 +1,11 @@
+ .option norvc
+ .text
+ .globl _start
+_start:
+ call target1
+ call target2
+ nop
+target1:
+ ret
+target2:
+ ret
diff --git a/ld/testsuite/ld-riscv-elf/delete-boundary.s b/ld/testsuite/ld-riscv-elf/delete-boundary.s
new file mode 100644
index 0000000000..0d9119f150
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/delete-boundary.s
@@ -0,0 +1,7 @@
+ .text
+ .globl _start
+_start:
+ .word 0
+ .word 0
+ .reloc 0, R_RISCV_64, 0
+ .reloc 4, R_RISCV_32, 0
diff --git a/ld/testsuite/ld-riscv-elf/delete-end.s b/ld/testsuite/ld-riscv-elf/delete-end.s
new file mode 100644
index 0000000000..0945559e5d
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/delete-end.s
@@ -0,0 +1,5 @@
+ .text
+ .globl _start
+_start:
+ .fill 8,1,0
+ .reloc 0, R_RISCV_64, 0
diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
index 21ee6cc60b..224791b413 100644
--- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
+++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
@@ -380,6 +380,16 @@ if [istarget "riscv*-*-*"] {
run_dump_test "tlsdesc-call-bounds-control"
run_dump_test "tlsdesc-call-bounds-rv32"
run_dump_test "tlsdesc-call-bounds-rv32-control"
+ run_dump_test "relax-call-bounds"
+ run_dump_test "relax-call-bounds-control"
+ run_dump_test "relax-align-bounds"
+ run_dump_test "relax-align-bounds-control"
+ run_dump_test "relax-call-section-end"
+ run_dump_test "relax-jal-bounds"
+ run_dump_test "relax-lui-bounds"
+ run_dump_test "relax-pcrel-bounds"
+ run_dump_test "relax-tls-le-bounds"
+ run_dump_test "relax-marker-end"
run_dump_test "relax-none-bounds"
run_dump_test "call-bounds-norelax-fail"
run_dump_test "call-bounds-norelax-control"
@@ -387,6 +397,8 @@ if [istarget "riscv*-*-*"] {
run_dump_test "call-bounds-norelax-rv32-pass"
run_dump_test "call-plt-bounds-norelax-fail"
run_dump_test "call-plt-bounds-norelax-control"
+ run_dump_test "relax-tlsdesc-bounds"
+ run_dump_test "deferred-delete"
run_dump_test "uleb128-reloc-bounds-rv32"
# TODO: Make the following tests work under RV32.
diff --git a/ld/testsuite/ld-riscv-elf/relax-align-bounds-control.d b/ld/testsuite/ld-riscv-elf/relax-align-bounds-control.d
new file mode 100644
index 0000000000..fc041bd704
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-align-bounds-control.d
@@ -0,0 +1,18 @@
+#name: RISC-V R_RISCV_ALIGN NOP area inside the section (control)
+#source: relax-align-bounds-pass.s
+#ld: --relax -e _start
+#objdump: -d
+#target: riscv*-*-*
+# 4 NOPs are expected: 1 source NOP at 0x0, 1 alignment padding NOP to an
+# 8-byte boundary emitted by GAS for .align 3 at 0x4, 1 source NOP at 0x8,
+# and 1 source NOP at 0xc. Section size is 16 bytes with no tail padding.
+
+.*: file format elf.*-.*riscv.*
+
+Disassembly of section \.text:
+
+[0-9a-f]+ <_start>:
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+nop
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+nop
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+nop
+[ ]+[0-9a-f]+:[ ]+[0-9a-f]+[ ]+nop
diff --git a/ld/testsuite/ld-riscv-elf/relax-align-bounds-pass.s b/ld/testsuite/ld-riscv-elf/relax-align-bounds-pass.s
new file mode 100644
index 0000000000..8596ec647b
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-align-bounds-pass.s
@@ -0,0 +1,15 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ # 1st NOP: source instruction at offset 0.
+ nop
+ # 2nd NOP: 4-byte alignment padding emitted by GAS for .align 3
+ # with an R_RISCV_ALIGN relocation (addend 4).
+ .align 3
+ # 3rd NOP: source instruction at offset 8.
+ nop
+ # 4th NOP: source instruction at offset 12.
+ # With 4 instructions, .text is exactly 16 bytes (a multiple of 8),
+ # so no tail padding is emitted.
+ nop
diff --git a/ld/testsuite/ld-riscv-elf/relax-align-bounds.d b/ld/testsuite/ld-riscv-elf/relax-align-bounds.d
new file mode 100644
index 0000000000..29162060c4
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-align-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V R_RISCV_ALIGN NOP area past the section
+#source: relax-align-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0 \+ 0x10 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-align-bounds.s b/ld/testsuite/ld-riscv-elf/relax-align-bounds.s
new file mode 100644
index 0000000000..088e1dce4d
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-align-bounds.s
@@ -0,0 +1,6 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ nop
+ .reloc 0, R_RISCV_ALIGN, 16
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-bounds-control.d b/ld/testsuite/ld-riscv-elf/relax-call-bounds-control.d
new file mode 100644
index 0000000000..ec4747ba91
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-bounds-control.d
@@ -0,0 +1,13 @@
+#name: RISC-V relaxed R_RISCV_CALL in the last eight bytes
+#source: relax-call-bounds-pass.s
+#ld: --relax -e _start
+#objdump: -d
+#target: riscv*-*-*
+
+.*: file format elf.*-.*riscv.*
+
+Disassembly of section \.text:
+
+[0-9a-f]+ <_start>:
+[ ]+[0-9a-f]+:[ ]+0000006f[ ]+.*
+#pass
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-bounds-pass.s b/ld/testsuite/ld-riscv-elf/relax-call-bounds-pass.s
new file mode 100644
index 0000000000..0ba440a7ae
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-bounds-pass.s
@@ -0,0 +1,6 @@
+ .text
+ .globl _start
+_start:
+ .fill 8, 1, 0
+ .reloc 0, R_RISCV_CALL, _start
+ .reloc 0, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-bounds.d b/ld/testsuite/ld-riscv-elf/relax-call-bounds.d
new file mode 100644
index 0000000000..598c4dbe91
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_CALL past the section
+#source: relax-call-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0 \+ 0x8 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-bounds.s b/ld/testsuite/ld-riscv-elf/relax-call-bounds.s
new file mode 100644
index 0000000000..fe221a1f7c
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-bounds.s
@@ -0,0 +1,6 @@
+ .text
+ .globl _start
+_start:
+ .fill 4, 1, 0
+ .reloc 0, R_RISCV_CALL, _start
+ .reloc 0, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-section-end.d b/ld/testsuite/ld-riscv-elf/relax-call-section-end.d
new file mode 100644
index 0000000000..5810c0dea0
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-section-end.d
@@ -0,0 +1,20 @@
+#name: RISC-V relaxed call at section end deletes trailing instruction bytes
+#source: relax-call-section-end.s
+#ld: --relax -e _start
+#readelf: -SW
+#target: riscv*-*-*
+
+There are .* section headers, starting at offset .*:
+Section Headers:
+ \[Nr\] Name.*
+ \[ 0\].*
+ \[ 1\] \.text[ \t]+PROGBITS[ \t]+[0-9a-f]+[ \t]+[0-9a-f]+[ \t]+001004.*
+ \[ 2\] \.riscv\.attributes.*
+ \[ 3\] \.symtab.*
+ \[ 4\] \.strtab.*
+ \[ 5\] \.shstrtab.*
+Key to Flags:
+ W .*
+ L .*
+ C .*
+ D .*
diff --git a/ld/testsuite/ld-riscv-elf/relax-call-section-end.s b/ld/testsuite/ld-riscv-elf/relax-call-section-end.s
new file mode 100644
index 0000000000..69ed142451
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-call-section-end.s
@@ -0,0 +1,9 @@
+ .text
+ .globl _start
+_start:
+ .align 12
+ call target
+ .section .text.target,"ax",@progbits
+ .globl target
+target:
+ ret
diff --git a/ld/testsuite/ld-riscv-elf/relax-jal-bounds.d b/ld/testsuite/ld-riscv-elf/relax-jal-bounds.d
new file mode 100644
index 0000000000..399f5552df
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-jal-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_JAL past section boundary
+#source: relax-jal-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0x2 \+ 0x4 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-jal-bounds.s b/ld/testsuite/ld-riscv-elf/relax-jal-bounds.s
new file mode 100644
index 0000000000..88e5cfb763
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-jal-bounds.s
@@ -0,0 +1,8 @@
+ .option rvc
+ .text
+ .globl _start
+_start:
+ c.nop
+ c.nop
+ .reloc 2, R_RISCV_JAL, _start
+ .reloc 2, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-lui-bounds.d b/ld/testsuite/ld-riscv-elf/relax-lui-bounds.d
new file mode 100644
index 0000000000..3f53ef45a4
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-lui-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_HI20 past section boundary
+#source: relax-lui-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0x2 \+ 0x4 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-lui-bounds.s b/ld/testsuite/ld-riscv-elf/relax-lui-bounds.s
new file mode 100644
index 0000000000..176c52e067
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-lui-bounds.s
@@ -0,0 +1,7 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ nop
+ .reloc 2, R_RISCV_HI20, _start
+ .reloc 2, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-marker-end.d b/ld/testsuite/ld-riscv-elf/relax-marker-end.d
new file mode 100644
index 0000000000..1d0aa63971
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-marker-end.d
@@ -0,0 +1,10 @@
+#name: RISC-V zero-width R_RISCV_RELAX at the section end
+#source: relax-marker-end.s
+#ld: -e _start
+#readelf: -h
+#target: riscv*-*-*
+
+ELF Header:
+ Magic: 7f 45 4c 46 .*
+ Class: ELF(32|64)
+#pass
diff --git a/ld/testsuite/ld-riscv-elf/relax-marker-end.s b/ld/testsuite/ld-riscv-elf/relax-marker-end.s
new file mode 100644
index 0000000000..93f5fbc9a7
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-marker-end.s
@@ -0,0 +1,5 @@
+ .text
+ .globl _start
+_start:
+ .fill 16, 1, 0
+ .reloc ., R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.d b/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.d
new file mode 100644
index 0000000000..31a06231ad
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_PCREL_LO12_I past section boundary
+#source: relax-pcrel-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0x2 \+ 0x4 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.s b/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.s
new file mode 100644
index 0000000000..51630848c5
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-pcrel-bounds.s
@@ -0,0 +1,7 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ nop
+ .reloc 2, R_RISCV_PCREL_LO12_I, _start
+ .reloc 2, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.d b/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.d
new file mode 100644
index 0000000000..8b4cdf2512
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_TPREL_LO12_I past section boundary
+#source: relax-tls-le-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0x2 \+ 0x4 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.s b/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.s
new file mode 100644
index 0000000000..d48e86c354
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-tls-le-bounds.s
@@ -0,0 +1,7 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ nop
+ .reloc 2, R_RISCV_TPREL_LO12_I, _start
+ .reloc 2, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.d b/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.d
new file mode 100644
index 0000000000..98a8f8f265
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.d
@@ -0,0 +1,5 @@
+#name: RISC-V relaxed R_RISCV_TLSDESC_HI20 past section boundary
+#source: relax-tlsdesc-bounds.s
+#ld: --relax -e _start
+#error: .*: bad relocation offset during relaxation \(0x2 \+ 0x4 > 0x4\) in section `\.text'
+#target: riscv*-*-*
diff --git a/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.s b/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.s
new file mode 100644
index 0000000000..a98b00eec7
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/relax-tlsdesc-bounds.s
@@ -0,0 +1,7 @@
+ .text
+ .option norvc
+ .globl _start
+_start:
+ nop
+ .reloc 2, R_RISCV_TLSDESC_HI20, _start
+ .reloc 2, R_RISCV_RELAX, 0
diff --git a/ld/testsuite/ld-riscv-elf/riscv-reloc-offset.exp b/ld/testsuite/ld-riscv-elf/riscv-reloc-offset.exp
index d5e95941cb..5e7a412726 100644
--- a/ld/testsuite/ld-riscv-elf/riscv-reloc-offset.exp
+++ b/ld/testsuite/ld-riscv-elf/riscv-reloc-offset.exp
@@ -27,6 +27,13 @@ if { ![istarget "riscv*-*-*"] } {
return
}
+# Relocation numbers from include/elf/riscv.h:
+# R_RISCV_ALIGN is 43.
+# R_RISCV_DELETE is defined as R_RISCV_max (66). If future RISC-V psABI
+# relocations are added before R_RISCV_max, this constant must be updated.
+set reloc_delete 66
+set reloc_align 43
+
global tmpdir
if { ![info exists tmpdir] } {
set tmpdir "tmpdir"
@@ -34,10 +41,19 @@ if { ![info exists tmpdir] } {
set obj "$tmpdir/huge-offset.o"
set bin "$tmpdir/huge-offset.out"
+set delete_obj "$tmpdir/delete-bounds.o"
+set delete_bin "$tmpdir/delete-bounds.out"
+set end_obj "$tmpdir/delete-end.o"
+set end_bin "$tmpdir/delete-end.out"
+set adj_obj "$tmpdir/delete-adjacent.o"
+set adj_bin "$tmpdir/delete-adjacent.out"
+set align_obj "$tmpdir/align-zero.o"
+set align_bin "$tmpdir/align-zero.out"
proc riscv_cleanup_files {} {
- global obj bin
- remote_file host delete $obj $bin
+ global obj bin delete_obj delete_bin end_obj end_bin adj_obj adj_bin align_obj align_bin
+ remote_file host delete $obj $bin $delete_obj $delete_bin $end_obj $end_bin \
+ $adj_obj $adj_bin $align_obj $align_bin
}
riscv_cleanup_files
@@ -89,6 +105,43 @@ proc riscv_patch_reloc_offset {obj offset} {
return 1
}
+# Patch relocation INDEX type and addend in .rela.text of OBJ.
+
+proc riscv_patch_reloc_type_n {obj index type addend} {
+ set info [riscv_rela_info $obj]
+ if { [llength $info] != 3 } {
+ return 0
+ }
+ lassign $info rela_off fmt entsize
+ set off [expr { $rela_off + $index * $entsize }]
+
+ set f [open $obj r+]
+ fconfigure $f -translation binary
+ if { $fmt == "w" || $fmt == "W" } {
+ seek $f [expr { $off + 8 }]
+ binary scan [read $f 8] $fmt r_info
+ set r_info [expr { ($r_info & ~0xffffffff) | $type }]
+ seek $f [expr { $off + 8 }]
+ puts -nonewline $f [binary format $fmt $r_info]
+ seek $f [expr { $off + 16 }]
+ puts -nonewline $f [binary format $fmt $addend]
+ } else {
+ seek $f [expr { $off + 4 }]
+ binary scan [read $f 4] $fmt r_info
+ set r_info [expr { ($r_info & ~0xff) | $type }]
+ seek $f [expr { $off + 4 }]
+ puts -nonewline $f [binary format $fmt $r_info]
+ seek $f [expr { $off + 8 }]
+ puts -nonewline $f [binary format $fmt $addend]
+ }
+ close $f
+ return 1
+}
+
+proc riscv_patch_reloc_type {obj type addend} {
+ return [riscv_patch_reloc_type_n $obj 0 $type $addend]
+}
+
proc riscv_check_abnormal_termination {testname output} {
if { [regexp "(core dumped|Aborted|double free|Segmentation fault)" $output] } {
verbose -log "$output"
@@ -184,4 +237,70 @@ if { ![default_ld_assemble $AS "" $src $obj] } {
}
}
+# R_RISCV_DELETE and R_RISCV_ALIGN bounds checking.
+if { ![default_ld_assemble $AS "" $src $delete_obj] } {
+ fail "RISC-V R_RISCV_DELETE range past the section (assemble)"
+} else {
+ # R_RISCV_DELETE range past section end.
+ if { ![riscv_patch_reloc_type $delete_obj $reloc_delete 0x1000] } {
+ fail "RISC-V R_RISCV_DELETE range past the section (patch)"
+ } else {
+ riscv_expect_reject "RISC-V R_RISCV_DELETE range past the section" \
+ $delete_bin "-e _start -o $delete_bin $delete_obj" "bad R_RISCV_DELETE range"
+ }
+
+ # Negative addend for R_RISCV_DELETE (cast to unsigned becomes huge).
+ if { ![riscv_patch_reloc_type $delete_obj $reloc_delete -1] } {
+ fail "RISC-V R_RISCV_DELETE negative addend (patch)"
+ } else {
+ riscv_expect_reject "RISC-V R_RISCV_DELETE negative addend" \
+ $delete_bin "-e _start -o $delete_bin $delete_obj" "bad R_RISCV_DELETE range"
+ }
+
+ # Negative addend for R_RISCV_ALIGN (cast to unsigned becomes huge).
+ if { ![riscv_patch_reloc_type $delete_obj $reloc_align -1] } {
+ fail "RISC-V R_RISCV_ALIGN negative addend (patch)"
+ } else {
+ riscv_expect_reject "RISC-V R_RISCV_ALIGN negative addend" \
+ $delete_bin "-e _start -o $delete_bin $delete_obj" "bad relocation offset during relaxation"
+ }
+}
+
+# R_RISCV_DELETE range one byte past section end.
+if { ![default_ld_assemble $AS "" "$srcdir/$subdir/delete-end.s" $end_obj] } {
+ fail "RISC-V R_RISCV_DELETE range at section end (assemble)"
+} else {
+ if { ![riscv_patch_reloc_type $end_obj $reloc_delete 9] } {
+ fail "RISC-V R_RISCV_DELETE range one byte past the section (patch)"
+ } else {
+ riscv_expect_reject "RISC-V R_RISCV_DELETE range one byte past the section" \
+ $end_bin "--relax -e _start -o $end_bin $end_obj" "bad R_RISCV_DELETE range"
+ }
+}
+
+# Overlapping R_RISCV_DELETE ranges.
+if { ![default_ld_assemble $AS "" "$srcdir/$subdir/delete-boundary.s" $adj_obj] } {
+ fail "RISC-V adjacent R_RISCV_DELETE ranges (assemble)"
+} else {
+ if { ![riscv_patch_reloc_type_n $adj_obj 0 $reloc_delete 6]
+ || ![riscv_patch_reloc_type_n $adj_obj 1 $reloc_delete 4] } {
+ fail "RISC-V overlapping R_RISCV_DELETE ranges (patch)"
+ } else {
+ riscv_expect_reject "RISC-V overlapping R_RISCV_DELETE ranges" \
+ $adj_bin "--relax -e _start -o $adj_bin $adj_obj" "overlapping R_RISCV_DELETE"
+ }
+}
+
+# Zero-width R_RISCV_ALIGN relocation is valid.
+if { ![default_ld_assemble $AS "" "$srcdir/$subdir/align-zero.s" $align_obj] } {
+ fail "RISC-V zero-width R_RISCV_ALIGN (assemble)"
+} else {
+ if { ![riscv_patch_reloc_type $align_obj $reloc_align 0] } {
+ fail "RISC-V zero-width R_RISCV_ALIGN (patch)"
+ } else {
+ riscv_expect_link "RISC-V zero-width R_RISCV_ALIGN" \
+ $align_bin "--relax -e _start -o $align_bin $align_obj"
+ }
+}
+
riscv_cleanup_files
--
2.55.0
More information about the Binutils
mailing list