From a0518f52346f6c31520aabae0ff023ff9835df37 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 21 Nov 2021 14:52:36 +0100 Subject: [PATCH] ANDROID: GKI: disable CONFIG_FORTIFY_SOURCE This build option is broken for clang and upstream removed it in commit 9000f2a528c0 ("fortify: Explicitly disable Clang support") so we have to also remove it for the gki defconfigs. Fixes: 9000f2a528c0 ("fortify: Explicitly disable Clang support") Signed-off-by: Greg Kroah-Hartman Change-Id: I8d4a1d38b736ee1fd4a6febfbab4d1a3c1c4d351 --- 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 83a30a47df95..a9f2f4afb940 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -491,7 +491,6 @@ 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 5c7e06ef8a2f..3f3aaaf99b50 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -427,7 +427,6 @@ 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