From 0d5c23b8b4fb6e3bd07824bfb4986d2603ecee78 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Wed, 13 Apr 2022 13:51:51 -0700 Subject: [PATCH] Revert "ANDROID: GKI: CONFIG_FORTIFY is broken in clang, so it has been disabled" This reverts commit b83dfb6d2d0b354065e5a7f4979763659ace4c78. Now that commit 281d0c962752 ("fortify: Add Clang support") has been merged, this should be turned back on. Change-Id: Iaf501cf1b0c4cf99cc1eae558f24fbc6d5131bfe Signed-off-by: Nathan Chancellor --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 92a1ecdf0577..b44745584c04 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -625,6 +625,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y +CONFIG_FORTIFY_SOURCE=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 6780967db039..10c53a89a6eb 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -565,6 +565,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y +CONFIG_FORTIFY_SOURCE=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y