From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 18 Dec 2018 17:44:50 +0000 (+0100)
Subject: kernel: Fix KERNEL_STACKPROTECTOR on kernel 4.19
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e790227553c057d38064e720add92b3bee42ecf2;p=openwrt%2Fstaging%2Fblocktrron.git

kernel: Fix KERNEL_STACKPROTECTOR on kernel 4.19

The configuration option was renamed with kernel 4.19 from
CONFIG_CC_STACKPROTECTOR to CONFIG_STACKPROTECTOR adapt the code to set
both options.

CONFIG_STACKPROTECTOR now sets the regular stack protector and
CONFIG_STACKPROTECTOR_STRONG activates the additional protection of more
functions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/config/Config-build.in b/config/Config-build.in
index a082a5e0e2..8cbc16b5c8 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -234,6 +234,14 @@ menu "Global build settings"
 			bool "Strong"
 	endchoice
 
+	config  KERNEL_STACKPROTECTOR
+		bool
+		default KERNEL_CC_STACKPROTECTOR_REGULAR || KERNEL_CC_STACKPROTECTOR_STRONG
+
+	config  KERNEL_STACKPROTECTOR_STRONG
+		bool
+		default KERNEL_CC_STACKPROTECTOR_STRONG
+
 	choice
 		prompt "Enable buffer-overflows detection (FORTIFY_SOURCE)"
 		default PKG_FORTIFY_SOURCE_1
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 3fe9164726..2698925c8c 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -748,10 +748,6 @@ CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_CC_IS_GCC=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CC_STACKPROTECTOR_NONE=y
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
@@ -1655,6 +1651,7 @@ CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_NMI=y
+CONFIG_HAVE_STACKPROTECTOR=y
 # CONFIG_HCALL_STATS is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HDLC is not set
@@ -4949,6 +4946,7 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
+# CONFIG_STACKPROTECTOR_STRONG is not set
 # CONFIG_STACKTRACE is not set
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACK_TRACER is not set