From: Greg KH <gregkh@linuxfoundation.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: stable@vger.kernel.org
Subject: Re: [PATCH 5.4 and 4.19] kbuild: Fix '-S -c' in x86 stack protector scripts
Date: Tue, 13 Aug 2024 12:35:23 +0200 [thread overview]
Message-ID: <2024081314-eclipse-earmuff-45b8@gregkh> (raw)
In-Reply-To: <20240730184054.254156-1-nathan@kernel.org>
On Tue, Jul 30, 2024 at 11:40:54AM -0700, Nathan Chancellor wrote:
> commit 3415b10a03945b0da4a635e146750dfe5ce0f448 upstream.
>
> After a recent change in clang to stop consuming all instances of '-S'
> and '-c' [1], the stack protector scripts break due to the kernel's use
> of -Werror=unused-command-line-argument to catch cases where flags are
> not being properly consumed by the compiler driver:
>
> $ echo | clang -o - -x c - -S -c -Werror=unused-command-line-argument
> clang: error: argument unused during compilation: '-c' [-Werror,-Wunused-command-line-argument]
>
> This results in CONFIG_STACKPROTECTOR getting disabled because
> CONFIG_CC_HAS_SANE_STACKPROTECTOR is no longer set.
>
> '-c' and '-S' both instruct the compiler to stop at different stages of
> the pipeline ('-S' after compiling, '-c' after assembling), so having
> them present together in the same command makes little sense. In this
> case, the test wants to stop before assembling because it is looking at
> the textual assembly output of the compiler for either '%fs' or '%gs',
> so remove '-c' from the list of arguments to resolve the error.
>
> All versions of GCC continue to work after this change, along with
> versions of clang that do or do not contain the change mentioned above.
>
> Cc: stable@vger.kernel.org
> Fixes: 4f7fd4d7a791 ("[PATCH] Add the -fstack-protector option to the CFLAGS")
> Fixes: 60a5317ff0f4 ("x86: implement x86_32 stack protector")
> Link: https://github.com/llvm/llvm-project/commit/6461e537815f7fa68cef06842505353cf5600e9c [1]
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> [nathan: Fixed conflict in 32-bit version due to lack of 3fb0fdb3bbe7]
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
> This change applies cleanly with 'patch -p1' on both 5.4 and 4.19.
> ---
> scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
> scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Now queued up, thanks.
greg k-h
prev parent reply other threads:[~2024-08-13 10:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-30 9:04 FAILED: patch "[PATCH] kbuild: Fix '-S -c' in x86 stack protector scripts" failed to apply to 5.4-stable tree gregkh
2024-07-30 18:40 ` [PATCH 5.4 and 4.19] kbuild: Fix '-S -c' in x86 stack protector scripts Nathan Chancellor
2024-08-13 10:35 ` Greg KH [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=2024081314-eclipse-earmuff-45b8@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=nathan@kernel.org \
--cc=stable@vger.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