From 29968bfa0a42a47565f4f301e131d33aad7eefe8 Mon Sep 17 00:00:00 2001 From: Lokesh Gidra Date: Wed, 3 Mar 2021 13:09:40 -0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_USERFAULTFD Patches for SELinux support and kernel page-fault restriction in userfaultfd have been backported. See references below. So from security perspective it should be safe to enable it in Android. 1) https://android-review.googlesource.com/c/kernel/common/+/1576486 2) https://android-review.googlesource.com/c/kernel/common/+/1576704 3) https://android-review.googlesource.com/c/kernel/common/+/1612597 4) https://android-review.googlesource.com/c/kernel/common/+/1574667 Signed-off-by: Lokesh Gidra Bug: 160737021 Bug: 169683130 Change-Id: Iac5143da76783de57dba229f5761aff9297c17ae (cherry picked from commit 16f20ce5aec12f4517c53b97f68908e38131b125) --- 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 0b9ec496b698..0a397d9ea381 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOT_CONFIG=y CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT_ALWAYS_ON=y +CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 27170f0512df..7c5c0b0e8e72 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -37,6 +37,7 @@ CONFIG_BOOT_CONFIG=y CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT_ALWAYS_ON=y +CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set