From 09cd270b4273429135bb5d538e8efdee03e1b1ec Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Fri, 14 Oct 2022 08:41:33 -0700 Subject: [PATCH] ANDROID: Drop explicit 'CONFIG_INIT_STACK_ALL_ZERO=y' from gki_defconfig After a backport of commit dcb7c0b9461c ("hardening: Clarify Kconfig text for auto-var-init"), this becomes redundant, as CONFIG_INIT_STACK_ALL_ZERO is enabled by default when the compiler supports it, which results in savedefconfig dropping it. Change-Id: Ia199fb999f98b936323cb60ecbbdc1ae365932c5 Signed-off-by: Nathan Chancellor --- 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 67418fc50830..5da3a24f591c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -556,7 +556,6 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y -CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_ADIANTUM=y CONFIG_CRYPTO_BLAKE2B=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f3d46d70e639..730bc65d0367 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -484,7 +484,6 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y -CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_ADIANTUM=y CONFIG_CRYPTO_BLAKE2B=y