From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.zytor.com (terminus.zytor.com [198.137.202.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 580FE2DE719 for ; Fri, 16 Jan 2026 20:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.136 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596103; cv=none; b=FEOOOKES+k6u/iTXX80bB+Dym9XwjXl9DiMoZgtNvGeBuLYfY3D1wlsUTOd8Ux1ByyJXHXIG6h1Q5Fa+QQAWKE7B+fDlISFr6pYR78HIWteehZ7W8isS/laFMXPgrhchRTQk9qGbqNHSjubzS7/6EQ/uGdoP3hE91H6dKfRSRNs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596103; c=relaxed/simple; bh=yEhrSG9F8k+f26qpzaUTQFd0ivFWKW4/GuPMDvMdYoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XHcKnetbExnH+8z9hehbb/iIv3QTCaQqIzrKl1bvy4QUJ/jpQNR1W1h6NK7rCmNpNdY6CqGu6+qv5TAZueXZK7SErFJBb68yXbd0ic4H8e2l+6GYUepNdCkAacEhx83cEkSm9mnj/GP52oWskXUoXy6RlbU8zF2HQ/Bh0Z/EMYE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com; spf=pass smtp.mailfrom=zytor.com; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b=O22r7uz5; arc=none smtp.client-ip=198.137.202.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zytor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="O22r7uz5" Received: from mail.zytor.com (c-76-133-66-138.hsd1.ca.comcast.net [76.133.66.138]) (authenticated bits=0) by mail.zytor.com (8.18.1/8.17.1) with ESMTPSA id 60GKf1UN2688687 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 16 Jan 2026 12:41:03 -0800 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 60GKf1UN2688687 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2025122301; t=1768596064; bh=7vG7tmenUpp5OM3M4/iKbKvkoYn3fSIYO0h86blRU/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O22r7uz5+SHSA7xjjJQPqAdBizBkWP4Hqm9da4ghohr4n9CnrPovFp3i2ULDqUojs AVtb83dYqvz2izMPeZEyqqzJf+uO4KuPEH3R3cE9I9nbQkNZLJdCB17SREo6rnmWRL 9Dngg86PmsWNfzgGHqn5H+e+h6uyy80PbVUc3OS4TYOFSZZ7FOEnWX/r8O+wf5wQrR qXD8QiZ/IBdKnOIeZUYhWI+2MB/ZWKN0ioA17jIX5MwiPtOyjQOjleu2juqR3FW0bN OXE1e9pek01naF3UYiDv5POASr18K3YJWeUw4pOKhjnqdT/cPuJqa15EEKMo9K8V33 vni9XIJqQlOyg== From: "H. Peter Anvin" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: "H. Peter Anvin" , x86@kernel.org, Chris Mason , Thorsten Leemhuis , 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 Message-ID: <20260116204057.386268-3-hpa@zytor.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116204057.386268-1-hpa@zytor.com> References: <20260116204057.386268-1-hpa@zytor.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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) --- 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