configure stack initialization dynamically based on gcc version

gcc >= 12 INIT_STACK_ALL_ZERO
gcc < 12 GCC_PLUGIN_STRUCTLEAK_BYREF_ALL

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index d2629601a30cb3ac433a8da4f3f487e2cdd99a2d..82817d7f6b9a15fb8939f49369d8dbcfed94525f 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -14434,7 +14434,7 @@ GCC_PLUGIN_STRUCTLEAK all=y
 INIT_STACK_NONE all=n
 GCC_PLUGIN_STRUCTLEAK_USER all=n
 GCC_PLUGIN_STRUCTLEAK_BYREF all=n
-GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=y
+INIT_STACK_ALL_PATTERN all=n
 GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n
 GCC_PLUGIN_STACKLEAK all=y
 STACKLEAK_TRACK_MIN_SIZE all=100

diff --git a/kernel.spec b/kernel.spec
index 3b4b24e8a95e24e0d62a66192db0ce801552fb54..2179557f619cf4ee033c2aea65f5d6fb01c865f6 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -890,6 +890,12 @@ BuildConfig() {
 %ifarch x32
                CONFIG_BPF_PRELOAD=n
 %endif
+%if %{_ver_ge %(rpm -q --qf='%%{VERSION}' gcc) 12}
+               CONFIG_INIT_STACK_ALL_ZERO=y
+               CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=n
+%else
+               CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+%endif
 EOCONFIG
 
 %if %{with rescuecd}