From b83dfb6d2d0b354065e5a7f4979763659ace4c78 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 6 Nov 2021 15:12:04 +0100 Subject: [PATCH] ANDROID: GKI: CONFIG_FORTIFY is broken in clang, so it has been disabled Commit a52f8a59aef4 ("fortify: Explicitly disable Clang support") dropped fortify support for clang compilers until the compiler is fixed up. This requires us to also drop it from the gki configurations as it is not able to be selected anymore. Fixes: a52f8a59aef4 ("fortify: Explicitly disable Clang support") Signed-off-by: Greg Kroah-Hartman Change-Id: Iad106506847e3f88c1129e8c61f58f68412f7cae --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index f4dbc2445e52..4223709545d8 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -625,7 +625,6 @@ CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set -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 11218693a8fd..b89db7790ebd 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -562,7 +562,6 @@ CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set -CONFIG_FORTIFY_SOURCE=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y