From: Sasha Levin <sashal@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org,
brgerst@gmail.com, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Nick Desaulniers <nick.desaulniers+lkml@gmail.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>
Subject: Re: Patch "x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations" has been added to the 6.14-stable tree
Date: Fri, 23 May 2025 08:23:32 -0400 [thread overview]
Message-ID: <aDBoxEL3_0rpplFl@lappy> (raw)
In-Reply-To: <20250522230101.GA1911411@ax162>
On Thu, May 22, 2025 at 04:01:01PM -0700, Nathan Chancellor wrote:
>On Thu, May 22, 2025 at 05:30:09PM -0400, Sasha Levin wrote:
>> This is a note to let you know that I've just added the patch titled
>>
>> x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations
>>
>> to the 6.14-stable tree which can be found at:
>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>>
>> The filename of the patch is:
>> x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch
>> and it can be found in the queue-6.14 subdirectory.
>>
>> If you, or anyone else, feels it should not be added to the stable tree,
>> please let <stable@vger.kernel.org> know about it.
>>
>>
>>
>> commit d8e603969259e50aa632d1a3fde8883f41e26150
>> Author: Brian Gerst <brgerst@gmail.com>
>> Date: Thu Jan 23 14:07:37 2025 -0500
>>
>> x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations
>>
>> [ 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@gmail.com>
>> Signed-off-by: Ingo Molnar <mingo@kernel.org>
>> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
>> Cc: Linus Torvalds <torvalds@linux-foundation.org>
>> Link: https://lore.kernel.org/r/20250123190747.745588-6-brgerst@gmail.com
>> Signed-off-by: Sasha Levin <sashal@kernel.org>
>>
>> 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.
>
>Didn't Ard just say this has no purpose in stable?
>
>https://lore.kernel.org/CAMj1kXGtasdqRPn8koNN095VEEU4K409QvieMdgGXNUK0kPgkw@mail.gmail.com/
Indeed! This was an issue with my scripts and happened to ~10 more
commits I was dropping. I've now dropped all of those.
Sorry for the noise and thanks for catching this!
--
Thanks,
Sasha
prev parent reply other threads:[~2025-05-23 12:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250522213009.3137023-1-sashal@kernel.org>
2025-05-22 23:01 ` Patch "x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations" has been added to the 6.14-stable tree Nathan Chancellor
2025-05-23 12:23 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aDBoxEL3_0rpplFl@lappy \
--to=sashal@kernel.org \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=justinstitt@google.com \
--cc=mingo@redhat.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox