commit 8c8277e38685f2c84b5c9f05feafc39b6ac58812
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 11 16:25:17 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 11 16:25:17 2025 -0700
tree 28cae7a50b9d720c2c6a32b2fe28605c083414af
parent 31fbf664795ecdcfa675fc10342d5ff9ec6d52f8
parent efc98946854f0653ffe3b0ba576f7745944e7bd6

Snap for 13197820 from efc98946854f0653ffe3b0ba576f7745944e7bd6 to 25Q2-release

Change-Id: I4fd0f0c839da3425f9aa6f45c93c639cc0af407d

loader/Loader.cpp

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 09e2e17..89bdb80 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -882,10 +882,6 @@
         BPF_PROG_TYPE_SOCKET_FILTER,
 };
 
-constexpr bpf_prog_type kUprobestatsAllowedProgTypes[] = {
-        BPF_PROG_TYPE_KPROBE,
-};
-
 // see b/162057235. For arbitrary program types, the concern is that due to the lack of
 // SELinux access controls over BPF program attachpoints, we have no way to control the
 // attachment of programs to shared resources (or to detect when a shared resource
@@ -909,13 +905,6 @@
                 .allowedProgTypes = kMemEventsAllowedProgTypes,
                 .allowedProgTypesLength = arraysize(kMemEventsAllowedProgTypes),
         },
-        // uprobestats
-        {
-                .dir = "/system/etc/bpf/uprobestats/",
-                .prefix = "uprobestats/",
-                .allowedProgTypes = kUprobestatsAllowedProgTypes,
-                .allowedProgTypesLength = arraysize(kUprobestatsAllowedProgTypes),
-        },
         // Vendor operating system
         {
                 .dir = "/vendor/etc/bpf/",