commit:     e7fe1516618bcc20ae9887a3325d9a77f59b39c6
Author:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  1 06:41:57 2025 +0000
Commit:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
CommitDate: Wed Oct  1 06:41:57 2025 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e7fe1516

Update CONFIG_GCC_PLUGIN_STACKLEAK to CONFIG_KSTACK_ERASE

Ref: https://lore.kernel.org/all/20250717232519.2984886-1-kees <AT> kernel.org/
bug: #963589

Signed-off-by: Arisu Tachibana <alicef <AT> gentoo.org>

 4567_distro-Gentoo-Kconfig.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
index 298dc6ec..5bcc8590 100644
--- a/4567_distro-Gentoo-Kconfig.patch
+++ b/4567_distro-Gentoo-Kconfig.patch
@@ -247,7 +247,7 @@
 +      depends on !X86_MSR && X86_64 && GENTOO_KERNEL_SELF_PROTECTION
 +      default n
 +      
-+      select GCC_PLUGIN_STACKLEAK
++      select KSTACK_ERASE
 +      select X86_KERNEL_IBT if CC_HAS_IBT=y && HAVE_OBJTOOL=y && 
(!LD_IS_LLD=n || LLD_VERSION>=140000) 
 +      select LEGACY_VSYSCALL_NONE
 +      select PAGE_TABLE_ISOLATION
@@ -273,7 +273,7 @@
 +      select ARM64_BTI_KERNEL if ( ARM64_BTI=y ) && ( ARM64_PTR_AUTH_KERNEL=y 
) && ( CC_HAS_BRANCH_PROT_PAC_RET_BTI=y ) && (CC_IS_GCC=n || GCC_VERSION >= 
100100 ) && (CC_IS_GCC=n ) && ((FUNCTION_GRAPH_TRACE=n || 
DYNAMIC_FTRACE_WITH_ARG=y ))
 +      select ARM64_SW_TTBR0_PAN
 +      select CONFIG_UNMAP_KERNEL_AT_EL0
-+      select GCC_PLUGIN_STACKLEAK
++      select KSTACK_ERASE
 +      select KASAN_HW_TAGS if HAVE_ARCH_KASAN_HW_TAGS=y
 +      select RANDOMIZE_BASE
 +      select RELOCATABLE

Reply via email to