mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "H. Peter Anvin" <hpa@zytor.com>
To: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
	Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
	x86@kernel.org, Chris Mason <clm@meta.com>,
	Thorsten Leemhuis <linux@leemhuis.info>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] x86/entry/vdso: fix filtering of vdso compiler flags
Date: Fri, 16 Jan 2026 12:40:55 -0800	[thread overview]
Message-ID: <20260116204057.386268-3-hpa@zytor.com> (raw)
In-Reply-To: <20260116204057.386268-1-hpa@zytor.com>

This fixes several typos in the filtering of compiler flags for vdso,
discovered by Chris Mason using an AI script:

1. "-fno-PIE" was written as "fno-PIE".
2. "CC_PLUGINS_FLAGS" was written as "CC_PLUGIN_FLAGS"
3. "CONFIG_X86_USER_SHADOW_STACK" was missing "CONFIG_".

To the best of my knowledge, none of these actually had any real
impact on the build at this time (the shadow stack option, in
particular, used happens to not generate any code), but they are
genuine bugs which could break things at any point in the future.

Reported-by: Chris Mason <clm@meta.com>
Closes: https://lore.kernel.org/20260116035807.2307742-1-clm@meta.com
Fixes: 693c819fedcd ("x86/entry/vdso: Refactor the vdso build")
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
---
 arch/x86/entry/vdso/common/Makefile.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/common/Makefile.include b/arch/x86/entry/vdso/common/Makefile.include
index 3514b4a6869b..bf5798cb6781 100644
--- a/arch/x86/entry/vdso/common/Makefile.include
+++ b/arch/x86/entry/vdso/common/Makefile.include
@@ -23,9 +23,9 @@ $(obj)/%.lds : KBUILD_CPPFLAGS += $(CPPFLAGS_VDSO_LDS)
 #
 flags-remove-y += \
 	-D__KERNEL__ -mcmodel=kernel -mregparm=3 \
-	-fno-pic -fno-PIC -fno-pie fno-PIE \
+	-fno-pic -fno-PIC -fno-pie -fno-PIE \
 	-mfentry -pg \
-	$(RANDSTRUCT_CFLAGS) $(GCC_PLUGIN_CFLAGS) $(KSTACK_ERASE_CFLAGS) \
+	$(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) $(KSTACK_ERASE_CFLAGS) \
 	$(RETPOLINE_CFLAGS) $(CC_FLAGS_LTO) $(CC_FLAGS_CFI) \
 	$(PADDING_CFLAGS)
 
@@ -45,7 +45,7 @@ flags-y += -fasynchronous-unwind-tables
 
 # Reset cf protections enabled by compiler default
 flags-y += $(call cc-option, -fcf-protection=none)
-flags-$(X86_USER_SHADOW_STACK) += $(call cc-option, -fcf-protection=return)
+flags-$(CONFIG_X86_USER_SHADOW_STACK) += $(call cc-option, -fcf-protection=return)
 # When user space IBT is supported, enable this.
 # flags-$(CONFIG_USER_IBT) += $(call cc-option, -fcf-protection=branch)
 
-- 
2.52.0


  parent reply	other threads:[~2026-01-16 20:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-16 20:40 [PATCH v2 0/3] tip:x86/entry: fix vdso build restructuring fallout H. Peter Anvin
2026-01-16 20:40 ` [PATCH v2 1/3] x86/entry/vdso: update the object paths for "make vdso_install" H. Peter Anvin
2026-01-16 21:46   ` [tip: x86/entry] x86/entry/vdso: Update " tip-bot2 for H. Peter Anvin
2026-01-16 20:40 ` H. Peter Anvin [this message]
2026-01-16 21:46   ` [tip: x86/entry] x86/entry/vdso: Fix filtering of vdso compiler flags tip-bot2 for H. Peter Anvin
2026-01-18  2:17   ` [PATCH v2 2/3] x86/entry/vdso: fix " kernel test robot
2026-01-18  5:19     ` H. Peter Anvin
2026-01-16 20:40 ` [PATCH v2 3/3] x86/entry/vdso, selftest: update location of vgetrandom-chacha.S H. Peter Anvin
2026-01-16 21:46   ` [tip: x86/entry] x86/entry/vdso/selftest: Update " tip-bot2 for H. Peter Anvin

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=20260116204057.386268-3-hpa@zytor.com \
    --to=hpa@zytor.com \
    --cc=bp@alien8.de \
    --cc=clm@meta.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@leemhuis.info \
    --cc=mingo@redhat.com \
    --cc=tglx@kernel.org \
    --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

all inboxes | Powered by JetHome®