diff mbox series

elf: Fix localplt.awk for DT_RELR-enabled builds

Message ID 20240715163906.376514-1-adhemerval.zanella@linaro.org
State Superseded
Headers show
Series elf: Fix localplt.awk for DT_RELR-enabled builds | expand

Commit Message

Adhemerval Zanella Netto July 15, 2024, 4:39 p.m. UTC 
For each input readelf output, localplt.awk parses each 'Relocation
section' entry, checks its offset against the dynamic section entry, and
saves each DT_JMPREL, DT_RELA, and DT_REL offset value it finds. After
all lines are read, the script checks if any segment offset differed
from 0, meaning at least one 'Relocation section' was matched.

However, if the shared object was built with RELR support and the static
linker could place all the relocation on DT_RELR, there would be no
DT_JMPREL, DT_RELA, and DT_REL entries; only a DT_RELR.

For the current three ABIs that support (aarch64, x86, and powerpc64),
the powerpc64 ld.so shows the behavior above. Both x86_64 and aarch64
show extra relocations on '.rela.dyn', which makes the script check to
succeed.

This patch fixes by handling DT_RELR, where the offset is checked
against the dynamic section entries and if the shared object contains an
entry it means that there are no extra PLT entries (since all
relocations are relative).

It fixes the elf/check-localplt failure on powerpc.

Checked with a build/check for aarch64-linux-gnu, x86_64-linux-gnu,
i686-linux-gnu, arm-linux-gnueabihf, s390x-linux-gnu, powerpc-linux-gnu,
powerpc64-linux-gnu, and powerpc64le-linux-gnu.
---
 scripts/localplt.awk | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Adhemerval Zanella Netto July 15, 2024, 4:39 p.m. UTC | #1 
On 15/07/24 13:39, Adhemerval Zanella wrote:
> For each input readelf output, localplt.awk parses each 'Relocation
> section' entry, checks its offset against the dynamic section entry, and
> saves each DT_JMPREL, DT_RELA, and DT_REL offset value it finds. After
> all lines are read, the script checks if any segment offset differed
> from 0, meaning at least one 'Relocation section' was matched.
> 
> However, if the shared object was built with RELR support and the static
> linker could place all the relocation on DT_RELR, there would be no
> DT_JMPREL, DT_RELA, and DT_REL entries; only a DT_RELR.
> 
> For the current three ABIs that support (aarch64, x86, and powerpc64),
> the powerpc64 ld.so shows the behavior above. Both x86_64 and aarch64
> show extra relocations on '.rela.dyn', which makes the script check to
> succeed.
> 
> This patch fixes by handling DT_RELR, where the offset is checked
> against the dynamic section entries and if the shared object contains an
> entry it means that there are no extra PLT entries (since all
> relocations are relative).
> 
> It fixes the elf/check-localplt failure on powerpc.
> 
> Checked with a build/check for aarch64-linux-gnu, x86_64-linux-gnu,
> i686-linux-gnu, arm-linux-gnueabihf, s390x-linux-gnu, powerpc-linux-gnu,
> powerpc64-linux-gnu, and powerpc64le-linux-gnu.
> ---
>  scripts/localplt.awk | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/localplt.awk b/scripts/localplt.awk
> index fe79ca01ab..831ab873c1 100644
> --- a/scripts/localplt.awk
> +++ b/scripts/localplt.awk
> @@ -10,8 +10,10 @@ BEGIN {
>  }
>  
>  FILENAME != lastfile {
> -  if (lastfile && jmprel_offset == 0 && rela_offset == 0 && rel_offset == 0) {
> +  if (lastfile && jmprel_offset == 0 && rela_offset == 0 && rel_offset == 0 \
> +      && relr_offset == 0) {
>      print FILENAME ": *** failed to find expected output (readelf -WSdr)";
> +    print lastfile, jmprel_offset, rela_offset, rel_offset, relr_offset

Sigh... I forgot to remove while preparing the patch.

>      result = 2;
>    }
>    if (pltrelsz > 0 && jmprel_offset == -1) {
> @@ -22,6 +24,7 @@ FILENAME != lastfile {
>    jmprel_offset = 0;
>    rela_offset = 0;
>    rel_offset = 0;
> +  relr_offset = 0;
>    pltrelsz = -1;
>    delete section_offset_by_address;
>  }
> @@ -77,6 +80,8 @@ in_relocs && relocs_offset == rel_offset && NF >= 5 {
>    }
>  }
>  
> +# No need to handle DT_RELR (all packed relocations are relative).
> +
>  in_relocs { next }
>  
>  $1 == "Relocation" && $2 == "section" && $5 == "offset" {
> @@ -121,4 +126,14 @@ $2 == "(REL)" {
>    }
>    next
>  }
> +
> +$2 == "(RELR)" {
> +  relr_addr = strtonum($3);
> +  if (relr_addr in section_offset_by_address) {
> +    relr_offset = section_offset_by_address[relr_addr];
> +  } else {
> +    print FILENAME ": *** DT_RELR does not match any section's address";
> +    result = 2;
> +  }
> +}
>  END { exit(result) }
diff mbox series

Patch

diff --git a/scripts/localplt.awk b/scripts/localplt.awk
index fe79ca01ab..831ab873c1 100644
--- a/scripts/localplt.awk
+++ b/scripts/localplt.awk
@@ -10,8 +10,10 @@  BEGIN {
 }
 
 FILENAME != lastfile {
-  if (lastfile && jmprel_offset == 0 && rela_offset == 0 && rel_offset == 0) {
+  if (lastfile && jmprel_offset == 0 && rela_offset == 0 && rel_offset == 0 \
+      && relr_offset == 0) {
     print FILENAME ": *** failed to find expected output (readelf -WSdr)";
+    print lastfile, jmprel_offset, rela_offset, rel_offset, relr_offset
     result = 2;
   }
   if (pltrelsz > 0 && jmprel_offset == -1) {
@@ -22,6 +24,7 @@  FILENAME != lastfile {
   jmprel_offset = 0;
   rela_offset = 0;
   rel_offset = 0;
+  relr_offset = 0;
   pltrelsz = -1;
   delete section_offset_by_address;
 }
@@ -77,6 +80,8 @@  in_relocs && relocs_offset == rel_offset && NF >= 5 {
   }
 }
 
+# No need to handle DT_RELR (all packed relocations are relative).
+
 in_relocs { next }
 
 $1 == "Relocation" && $2 == "section" && $5 == "offset" {
@@ -121,4 +126,14 @@  $2 == "(REL)" {
   }
   next
 }
+
+$2 == "(RELR)" {
+  relr_addr = strtonum($3);
+  if (relr_addr in section_offset_by_address) {
+    relr_offset = section_offset_by_address[relr_addr];
+  } else {
+    print FILENAME ": *** DT_RELR does not match any section's address";
+    result = 2;
+  }
+}
 END { exit(result) }