From 8ced7a7bf5454ba1e020a3ea643848101c7f3b02 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Feb 04 2020 18:51:30 +0000
Subject: Temporarily disable STACKPROTECTOR_STRONG for x86 (rhbz 1796780)


Kernels built with gcc 10.0.1-0.7.fc32 and STACKPROTECTOR_STRONG panic
on boot due to a corrupted stack.

---

diff --git a/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG b/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG
deleted file mode 100644
index 6c88544..0000000
--- a/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STACKPROTECTOR_STRONG=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 053817b..587f6ab 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5736,7 +5736,7 @@ CONFIG_SSB_SDIOHOST=y
 CONFIG_STACKLEAK_METRICS=y
 CONFIG_STACKLEAK_RUNTIME_DISABLE=y
 CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-CONFIG_STACKPROTECTOR_STRONG=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 36b92d4..f1b72e9 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5715,7 +5715,7 @@ CONFIG_SSB_SDIOHOST=y
 CONFIG_STACKLEAK_METRICS=y
 CONFIG_STACKLEAK_RUNTIME_DISABLE=y
 CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-CONFIG_STACKPROTECTOR_STRONG=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 2b57942..dfb77d5 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5791,7 +5791,7 @@ CONFIG_SSB_SDIOHOST=y
 CONFIG_STACKLEAK_METRICS=y
 CONFIG_STACKLEAK_RUNTIME_DISABLE=y
 CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-CONFIG_STACKPROTECTOR_STRONG=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 12b3364..300e7d6 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5770,7 +5770,7 @@ CONFIG_SSB_SDIOHOST=y
 CONFIG_STACKLEAK_METRICS=y
 CONFIG_STACKLEAK_RUNTIME_DISABLE=y
 CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-CONFIG_STACKPROTECTOR_STRONG=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y