aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-12-18 18:44:50 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-26 17:32:48 +0100
commite790227553c057d38064e720add92b3bee42ecf2 (patch)
tree18ff07a83e47804a1b9bf2a6d6540bd6c074cf71 /config
parentb1daead066173e2cdef362fa5b1776daa5ff7924 (diff)
downloadupstream-e790227553c057d38064e720add92b3bee42ecf2.tar.gz
upstream-e790227553c057d38064e720add92b3bee42ecf2.tar.bz2
upstream-e790227553c057d38064e720add92b3bee42ecf2.zip
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>
Diffstat (limited to 'config')
-rw-r--r--config/Config-build.in8
1 files changed, 8 insertions, 0 deletions
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