linux-kernel - Re: [PATCH AUTOSEL 6.14 400/642] x86/relocs: Handle R_X86_64_REX

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMj1kXF6=t9NoH5Lsh4=RwhUTHtpBt9VmZr3bEVm6=1zGiOf2w@mail.gmail.com>
Date: Tue, 6 May 2025 00:32:05 +0200
From: Ard Biesheuvel <ardb@...nel.org>
To: Sasha Levin <sashal@...nel.org>
Cc: linux-kernel@...r.kernel.org, stable@...r.kernel.org, 
	Brian Gerst <brgerst@...il.com>, Ingo Molnar <mingo@...nel.org>, 
	Linus Torvalds <torvalds@...ux-foundation.org>, tglx@...utronix.de, mingo@...hat.com, 
	bp@...en8.de, dave.hansen@...ux.intel.com, x86@...nel.org, nathan@...nel.org, 
	ubizjak@...il.com, thomas.weissschuh@...utronix.de, llvm@...ts.linux.dev
Subject: Re: [PATCH AUTOSEL 6.14 400/642] x86/relocs: Handle
 R_X86_64_REX_GOTPCRELX relocations

On Tue, 6 May 2025 at 00:30, Sasha Levin <sashal@...nel.org> wrote:
>
> From: Brian Gerst <brgerst@...il.com>
>
> [ Upstream commit cb7927fda002ca49ae62e2782c1692acc7b80c67 ]
>
> Clang may produce R_X86_64_REX_GOTPCRELX relocations when redefining the
> stack protector location.  Treat them as another type of PC-relative
> relocation.
>
> Signed-off-by: Brian Gerst <brgerst@...il.com>
> Signed-off-by: Ingo Molnar <mingo@...nel.org>
> Reviewed-by: Ard Biesheuvel <ardb@...nel.org>
> Cc: Linus Torvalds <torvalds@...ux-foundation.org>
> Link: https://lore.kernel.org/r/20250123190747.745588-6-brgerst@gmail.com
> Signed-off-by: Sasha Levin <sashal@...nel.org>

This patch was one of a series of about 20 patches. Did you pick all of them?


> ---
>  arch/x86/tools/relocs.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
> index e937be979ec86..92a1e503305ef 100644
> --- a/arch/x86/tools/relocs.c
> +++ b/arch/x86/tools/relocs.c
> @@ -32,6 +32,11 @@ static struct relocs         relocs32;
>  static struct relocs           relocs32neg;
>  static struct relocs           relocs64;
>  # define FMT PRIu64
> +
> +#ifndef R_X86_64_REX_GOTPCRELX
> +# define R_X86_64_REX_GOTPCRELX 42
> +#endif
> +
>  #else
>  # define FMT PRIu32
>  #endif
> @@ -227,6 +232,7 @@ static const char *rel_type(unsigned type)
>                 REL_TYPE(R_X86_64_PC16),
>                 REL_TYPE(R_X86_64_8),
>                 REL_TYPE(R_X86_64_PC8),
> +               REL_TYPE(R_X86_64_REX_GOTPCRELX),
>  #else
>                 REL_TYPE(R_386_NONE),
>                 REL_TYPE(R_386_32),
> @@ -861,6 +867,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
>
>         case R_X86_64_PC32:
>         case R_X86_64_PLT32:
> +       case R_X86_64_REX_GOTPCRELX:
>                 /*
>                  * PC relative relocations don't need to be adjusted unless
>                  * referencing a percpu symbol.
> --
> 2.39.5
>