From baabe599de8c3ce00e163b2204b1bbebcae4f957 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Nov 2021 10:50:01 +0100 Subject: [PATCH] ANDROID: GKI: remove CONFIG_HARDENED_USERCOPY_FALLBACK from gki defconfig Commit 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK") removed the config option from the kernel, so it also needs to be removed from the gki_defconfig files in order for the build to work properly. Fixes: 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK") Signed-off-by: Greg Kroah-Hartman Change-Id: I96185cd7bf64da0287f72e00dafa2cb13bbda7f5 --- 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 0861758feaaa..9ea1a078586a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -626,7 +626,6 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_FALLBACK is not set 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 d0a9c5025c25..94ed97b50cfd 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -563,7 +563,6 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_FALLBACK is not set CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y