From 2a31b4731866632c78bd594dc26a7bf152aa741e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 9 Sep 2021 17:20:17 +0200 Subject: [PATCH] ANDROID: GKI: remove CONFIG_INIT_STACK_ALL_ZERO from gki_defconfig Thanks to commit dcb7c0b9461c ("hardening: Clarify Kconfig text for auto-var-init"), CONFIG_INIT_STACK_ALL_ZERO is now automatically selected depending on the compiler's support for it, so it is not longer needed to explicitly enable it in the config file. Fixes: dcb7c0b9461c ("hardening: Clarify Kconfig text for auto-var-init") Signed-off-by: Greg Kroah-Hartman Change-Id: I9df386f22d3a24ae0f9ab4da2e0ab35277a48f17 --- 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 89edc0590fa9..8b978f469d90 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -619,7 +619,6 @@ CONFIG_FORTIFY_SOURCE=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_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 4774d0b35d56..9eedc4798c53 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -562,7 +562,6 @@ CONFIG_FORTIFY_SOURCE=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_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y