From 4a0622c2681aa49064cab6b96506d332f8859592 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Tue, 12 May 2020 08:30:56 -0700 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER The helper is set to the empty string. Bug: 156358723 Change-Id: Ia7923f80a0617814bddd514bdf01a4ceffc3eddb Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index e98863c79514..7ca44534f863 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -477,6 +477,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set CONFIG_FORTIFY_SOURCE=y +CONFIG_STATIC_USERMODEHELPER=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 a571e5ff8985..fb93ef7f709d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -419,6 +419,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set CONFIG_FORTIFY_SOURCE=y +CONFIG_STATIC_USERMODEHELPER=y CONFIG_SECURITY_SELINUX=y CONFIG_INIT_STACK_ALL=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y