From f9c963bb042b0c2b08b9fe9d9784ce34851a2d4d Mon Sep 17 00:00:00 2001 From: "Shi, Qiming" Date: Thu, 18 Jul 2024 10:25:39 +0000 Subject: [PATCH] Enable kprobes, uprobes and fuse_bpf dependent driver modules STS testcase testSetMaliciousStream was failing with warning: FuseDaemon: Rejected access to app-private dir on FUSE Fix the issue by enabling kprobes, uprobes and fuse_bpf dependent drivers modules. This patch is ported from base_aaos. Tests Done: run sts-dynamic-full -m CtsSecurityTestCases -t android.security.cts.WallpaperManagerTest#testSetMaliciousStream Tracked-On: OAM-118465 Signed-off-by: Shi, Qiming Signed-off-by: Salini Venate --- .../config-lts/lts2022-chromium/x86_64_defconfig | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/groups/kernel/gmin64/config-lts/lts2022-chromium/x86_64_defconfig b/groups/kernel/gmin64/config-lts/lts2022-chromium/x86_64_defconfig index 9de3fa9e6..bd71188e3 100644 --- a/groups/kernel/gmin64/config-lts/lts2022-chromium/x86_64_defconfig +++ b/groups/kernel/gmin64/config-lts/lts2022-chromium/x86_64_defconfig @@ -116,6 +116,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set # CONFIG_BPF_DYNPTR is not set # CONFIG_BPF_PRELOAD is not set +# CONFIG_BPF_LSM is not set # end of BPF subsystem CONFIG_PREEMPT_BUILD=y @@ -631,6 +632,7 @@ CONFIG_KPROBES=y # CONFIG_JUMP_LABEL is not set # CONFIG_STATIC_CALL_SELFTEST is not set CONFIG_OPTPROBES=y +CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y @@ -7640,8 +7642,12 @@ CONFIG_HWLAT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_KPROBE_EVENTS is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set # CONFIG_SYNTH_EVENTS is not set # CONFIG_HIST_TRIGGERS is not set # CONFIG_TRACE_EVENT_INJECT is not set @@ -7652,6 +7658,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_RV is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_SAMPLES is not set