Merge "Allow priv_app to search apex_data_file and read staging_data_file" into rvc-dev

This commit is contained in:
Nikita Ioffe 2020-04-24 21:44:40 +00:00 committed by Android (Google) Code Review
commit 91cecb75ca
2 changed files with 5 additions and 1 deletions

View file

@ -209,7 +209,7 @@ neverallow {
# do not change between system_server staging the files and apexd processing # do not change between system_server staging the files and apexd processing
# the files. # the files.
neverallow { domain -init -system_server -apexd -installd -iorap_inode2filename } staging_data_file:dir *; neverallow { domain -init -system_server -apexd -installd -iorap_inode2filename } staging_data_file:dir *;
neverallow { domain -init -system_app -system_server -apexd -kernel -installd -iorap_inode2filename } staging_data_file:file *; neverallow { domain -init -system_app -system_server -apexd -kernel -installd -iorap_inode2filename -priv_app } staging_data_file:file *;
neverallow { domain -init -system_server -installd} staging_data_file:dir no_w_dir_perms; neverallow { domain -init -system_server -installd} staging_data_file:dir no_w_dir_perms;
# apexd needs the link and unlink permissions, so list every `no_w_file_perms` # apexd needs the link and unlink permissions, so list every `no_w_file_perms`
# except for `link` and `unlink`. # except for `link` and `unlink`.

View file

@ -157,6 +157,10 @@ allow priv_app incremental_control_file:file { read getattr ioctl };
# on the Incremental File System. # on the Incremental File System.
allowxperm priv_app incremental_control_file:file ioctl INCFS_IOCTL_PERMIT_FILL; allowxperm priv_app incremental_control_file:file ioctl INCFS_IOCTL_PERMIT_FILL;
# Required for Phonesky to be able to read APEX files under /data/apex/active/.
allow priv_app apex_data_file:dir search;
allow priv_app staging_data_file:file r_file_perms;
### ###
### neverallow rules ### neverallow rules
### ###