Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfed4cb1 authored Jul 13, 2020 by Todd Kjos

ANDROID: GKI: set CONFIG_STATIC_USERMODEHELPER_PATH



The android.security.cts.KernelConfigTest#testConfigDisableUsermodehelper
test is failing because CONFIG_STATIC_USERMODEHELPER_PATH is set to
an invalid value ("/sbin/usermode-helper") for the test. Setting to ""
instead.

Bug: 160949257
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I1d9f003c15a6b1d9a7f47804e50661a44a0725d5

parent e265d597

arch/arm64/configs/gki_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,7 @@ CONFIG_HARDENED_USERCOPY=y
		# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
		CONFIG_FORTIFY_SOURCE=y
		CONFIG_STATIC_USERMODEHELPER=y
		CONFIG_STATIC_USERMODEHELPER_PATH=""
		CONFIG_SECURITY_SELINUX=y
		CONFIG_INIT_STACK_ALL=y
		CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y

arch/x86/configs/gki_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -447,6 +447,7 @@ CONFIG_HARDENED_USERCOPY=y
		# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
		CONFIG_FORTIFY_SOURCE=y
		CONFIG_STATIC_USERMODEHELPER=y
		CONFIG_STATIC_USERMODEHELPER_PATH=""
		CONFIG_SECURITY_SELINUX=y
		CONFIG_INIT_STACK_ALL=y
		CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y