commit fa7683c9ad62362b2c4b0a23cbae5d5a88aa7fee
author Maciej Żenczykowski <maze@google.com> Tue Jan 25 02:31:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 25 02:31:59 2022 +0000
tree 5e63a54abb44166341486b54359bf228750da254
parent 5c27113222cd59bc1f127674aae6865f8811e35d
parent dbe26843220849e7d647fdb538fa343341983355

Merge "Allow bpfloader to execute btfloader"

private/bpfloader.te

diff --git a/private/bpfloader.te b/private/bpfloader.te
index 78cd37e..650117e 100644
--- a/private/bpfloader.te
+++ b/private/bpfloader.te
@@ -17,6 +17,8 @@
 
 set_prop(bpfloader, bpf_progs_loaded_prop)
 
+allow bpfloader bpfloader_exec:file execute_no_trans;
+
 ###
 ### Neverallow rules
 ###

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 784bc6d..422d83a 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -365,6 +365,7 @@
 /system/bin/stats                u:object_r:stats_exec:s0
 /system/bin/statsd               u:object_r:statsd_exec:s0
 /system/bin/bpfloader            u:object_r:bpfloader_exec:s0
+/system/bin/btfloader            u:object_r:bpfloader_exec:s0
 /system/bin/watchdogd            u:object_r:watchdogd_exec:s0
 /system/bin/apexd                u:object_r:apexd_exec:s0
 /system/bin/gsid                 u:object_r:gsid_exec:s0