From 7bd9061f15b4ef6904890d5efa54224ceed2d829 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 25 Oct 2019 10:48:55 -0700 Subject: [PATCH] ANDROID: gki_defconfig: add FORTIFY_SOURCE, remove SPMI_MSM_PMIC_ARB Force SPMI_MSM_PMIC_ARB off and enable FORTIFY_SOURCE for GKI Bug: 142896904 Bug: 134087016 Test: Build/Boot on cuttlefish Change-Id: Ib6e501f1efee2349d750010a53572dddcb5457c5 Signed-off-by: Todd Kjos (cherry picked from 6f2fe74a1b296286a65547150b733dc36837fd8d) Signed-off-by: Will McVicker --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 5e983d4cfd81..919df2d3ecbf 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -305,6 +305,7 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set CONFIG_SPI=y CONFIG_SPMI=y +# CONFIG_SPMI_MSM_PMIC_ARB is not set CONFIG_PINCTRL_AMD=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_AVS=y @@ -478,6 +479,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y +CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_SELINUX=y CONFIG_INIT_STACK_ALL=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c8fad0877342..ea16bd5cd458 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -410,6 +410,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y +CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_SELINUX=y CONFIG_INIT_STACK_ALL=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y