Index | Thread | Search

From:
Mark Kettenis <mark.kettenis@xs4all.nl>
Subject:
Re: ld.so/hppa: skip RELOC_NONE in the hppa fast path
To:
Kirill A. Korinsky <kirill@korins.ky>
Cc:
miod@online.fr, tech@openbsd.org
Date:
Sat, 07 Nov 2026 07:27:55 +0100

Download raw body.

Thread
> Date: Fri, 06 Nov 2026 23:00:54 +0100
> From: Kirill A. Korinsky <kirill@korins.ky>
> 
> On Fri, 06 Nov 2026 18:13:10 +0100,
> Miod Vallat <miod@online.fr> wrote:
> > 
> > > my quest with building gcc-16 at hppa allow me discvoer that BFD can include
> > > RELOC_NONE in DT_RELACOUNT.
> > > 
> > > Let skip them in the fast relocation loop, matching the normal loop, that
> > > actually prevents a crash or how had I discovered this.
> > 
> > Sure, but that logic should probably be added to other platforms as they
> > might get bitten by the same problem eventually.
> > 
> 
> Like this?

ok kettenis@

> Index: libexec/ld.so/aarch64/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/aarch64/rtld_machine.c,v
> diff -u -p -r1.23 rtld_machine.c
> --- libexec/ld.so/aarch64/rtld_machine.c	16 Jul 2026 11:21:36 -0000	1.23
> +++ libexec/ld.so/aarch64/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -120,6 +120,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where += loff;
>  	}
> Index: libexec/ld.so/alpha/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/alpha/rtld_machine.c,v
> diff -u -p -r1.72 rtld_machine.c
> --- libexec/ld.so/alpha/rtld_machine.c	16 Jul 2026 11:21:36 -0000	1.72
> +++ libexec/ld.so/alpha/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -75,6 +75,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, relas++) {
>  		Elf_Addr *r_addr;
>  
> +		if (ELF_R_TYPE(relas->r_info) == R_TYPE(NONE))
> +			continue;
>  		r_addr = (Elf_Addr *)(relas->r_offset + loff);
>  
>  		/* Handle unaligned RELATIVE relocs */
> Index: libexec/ld.so/amd64/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/amd64/rtld_machine.c,v
> diff -u -p -r1.43 rtld_machine.c
> --- libexec/ld.so/amd64/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.43
> +++ libexec/ld.so/amd64/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -193,6 +193,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where = rels->r_addend + loff;
>  	}
> Index: libexec/ld.so/arm/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/arm/rtld_machine.c,v
> diff -u -p -r1.44 rtld_machine.c
> --- libexec/ld.so/arm/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.44
> +++ libexec/ld.so/arm/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -185,6 +185,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where += loff;
>  	}
> Index: libexec/ld.so/hppa/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/hppa/rtld_machine.c,v
> diff -u -p -r1.45 rtld_machine.c
> --- libexec/ld.so/hppa/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.45
> +++ libexec/ld.so/hppa/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -153,7 +153,11 @@ _dl_md_reloc(elf_object_t *object, int r
>  
>  	/* tight loop for leading relative relocs */
>  	for (i = 0; i < num_relative; i++, rela++) {
> -		Elf_Addr *where = (Elf_Addr *)(rela->r_offset + loff);
> +		Elf_Addr *where;
> +
> +		if (ELF_R_TYPE(rela->r_info) == RELOC_NONE)
> +			continue;
> +		where = (Elf_Addr *)(rela->r_offset + loff);
>  		*where = rela->r_addend + loff;
>  	}
>  	for (; i < numrela; i++, rela++) {
> Index: libexec/ld.so/i386/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/i386/rtld_machine.c,v
> diff -u -p -r1.52 rtld_machine.c
> --- libexec/ld.so/i386/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.52
> +++ libexec/ld.so/i386/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -193,6 +193,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where += loff;
>  	}
> Index: libexec/ld.so/m88k/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/m88k/rtld_machine.c,v
> diff -u -p -r1.32 rtld_machine.c
> --- libexec/ld.so/m88k/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.32
> +++ libexec/ld.so/m88k/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -87,6 +87,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrela; i++, relas++) {
>  		Elf_Addr *r_addr;
>  
> +		if (ELF_R_TYPE(relas->r_info) == RELOC_NONE)
> +			continue;
>  		r_addr = (Elf_Addr *)(relas->r_offset + loff);
>  		*r_addr = relas->r_addend + loff;
>  	}
> Index: libexec/ld.so/powerpc/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/powerpc/rtld_machine.c,v
> diff -u -p -r1.74 rtld_machine.c
> --- libexec/ld.so/powerpc/rtld_machine.c	24 Aug 2026 19:43:01 -0000	1.74
> +++ libexec/ld.so/powerpc/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -78,6 +78,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, relas++) {
>  		Elf_Addr *r_addr;
>  
> +		if (ELF_R_TYPE(relas->r_info) == RELOC_NONE)
> +			continue;
>  		r_addr = (Elf_Addr *)(relas->r_offset + loff);
>  		*r_addr = loff + relas->r_addend;
>  	}
> Index: libexec/ld.so/powerpc64/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/powerpc64/rtld_machine.c,v
> diff -u -p -r1.8 rtld_machine.c
> --- libexec/ld.so/powerpc64/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.8
> +++ libexec/ld.so/powerpc64/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -77,6 +77,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, relas++) {
>  		Elf_Addr *r_addr;
>  
> +		if (ELF_R_TYPE(relas->r_info) == R_PPC64_NONE)
> +			continue;
>  		r_addr = (Elf_Addr *)(relas->r_offset + loff);
>  		*r_addr = loff + relas->r_addend;
>  	}
> Index: libexec/ld.so/riscv64/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/riscv64/rtld_machine.c,v
> diff -u -p -r1.5 rtld_machine.c
> --- libexec/ld.so/riscv64/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.5
> +++ libexec/ld.so/riscv64/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -119,6 +119,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where += loff;
>  	}
> Index: libexec/ld.so/sh/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/sh/rtld_machine.c,v
> diff -u -p -r1.37 rtld_machine.c
> --- libexec/ld.so/sh/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.37
> +++ libexec/ld.so/sh/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -438,6 +438,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, rels++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(rels->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(rels->r_offset + loff);
>  		*where = rels->r_addend + loff;
>  	}
> Index: libexec/ld.so/sparc64/rtld_machine.c
> ===================================================================
> RCS file: /home/cvs/src/libexec/ld.so/sparc64/rtld_machine.c,v
> diff -u -p -r1.75 rtld_machine.c
> --- libexec/ld.so/sparc64/rtld_machine.c	16 Jul 2026 11:21:37 -0000	1.75
> +++ libexec/ld.so/sparc64/rtld_machine.c	6 Nov 2026 21:57:35 -0000
> @@ -231,6 +231,8 @@ _dl_md_reloc(elf_object_t *object, int r
>  	for (i = 0; i < relrel; i++, relas++) {
>  		Elf_Addr *where;
>  
> +		if (ELF_R_TYPE(relas->r_info) == R_TYPE(NONE))
> +			continue;
>  		where = (Elf_Addr *)(relas->r_offset + loff);
>  		*where = relas->r_addend + loff;
>  	}
> 
> 
> 
> -- 
> wbr, Kirill
> 
>