summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-06-08 18:09:09 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-09 11:47:37 +0200
commit67e707bd68269aac70904943f07a979eeb163b13 (patch)
tree159a275a251201a0e3eb2ea2e76b7bab49c52521
parent248fa516134f038341bd8598b9d4d627c771dcbe (diff)
downloadlinux-67e707bd68269aac70904943f07a979eeb163b13.tar.bz2
config: android-recommended: enable fstack-protector-strong
If compiler has stack protector support, set CONFIG_CC_STACKPROTECTOR_STRONG. Reviewed-at: https://android-review.googlesource.com/#/c/238388/ Signed-off-by: Jeff Vander Stoep <jeffv@google.com> [AmitP: cherry-picked this change from Android common kernel] Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/configs/android-recommended.config1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config
index 28ee064b6744..a86faa41bfd2 100644
--- a/kernel/configs/android-recommended.config
+++ b/kernel/configs/android-recommended.config
@@ -11,6 +11,7 @@ CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_COMPACTION=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_DM_CRYPT=y