commit 24d881cee85582bdfce087d702e4dac90d428ecd
author Primiano Tucci <primiano@google.com> Mon Jan 18 16:05:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 18 16:05:06 2021 +0000
tree a10bcf6dbc6ed1402bf81c8a902c96294015e625
parent e0ebc571bd5a0d7021717959b0f9ed83422befc9
parent 2bb858793369ca79a5b45e2133cb318893b861c9

Merge "Allow shell + priv_app to traverse /data/misc/perfetto-traces"

private/priv_app.te

diff --git a/private/priv_app.te b/private/priv_app.te
index dde8f09..46362a0 100644
--- a/private/priv_app.te
+++ b/private/priv_app.te
@@ -72,6 +72,8 @@
 # in progress.
 allow priv_app perfetto_traces_bugreport_data_file:dir r_dir_perms;
 allow priv_app perfetto_traces_bugreport_data_file:file { getattr };
+# Required to traverse the parent dir (/data/misc/perfetto-traces).
+allow priv_app perfetto_traces_data_file:dir { search };
 
 # Allow verifier to access staged apks.
 allow priv_app { apk_tmp_file apk_private_tmp_file }:dir r_dir_perms;

private/shell.te

diff --git a/private/shell.te b/private/shell.te
index 73aac1d..e6038b1 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -51,6 +51,9 @@
 # Allow shell to read and unlink traces stored in /data/misc/perfetto-traces.
 allow shell perfetto_traces_data_file:dir rw_dir_perms;
 allow shell perfetto_traces_data_file:file { r_file_perms unlink };
+# ... and /data/misc/perfetto-traces/bugreport/ .
+allow shell perfetto_traces_bugreport_data_file:dir rw_dir_perms;
+allow shell perfetto_traces_bugreport_data_file:file { r_file_perms unlink };
 
 # Allow shell to create/remove configs stored in /data/misc/perfetto-configs.
 allow shell perfetto_configs_data_file:dir rw_dir_perms;