Merge changes I179c05b3,Ia529ede4

* changes:
  Add dac_read_search to apexd to prevent spurious denials.
  Allow apexd to execute toybox for snapshot & restore.
This commit is contained in:
Oli Lan 2020-01-31 10:05:21 +00:00 committed by Gerrit Code Review
commit 2b44078cac

View file

@ -45,7 +45,7 @@ allow apexd dm_device:blk_file rw_file_perms;
# sys_admin is required to access the device-mapper and mount # sys_admin is required to access the device-mapper and mount
# dac_override, chown, and fowner are needed for snapshot and restore # dac_override, chown, and fowner are needed for snapshot and restore
allow apexd self:global_capability_class_set { sys_admin chown dac_override fowner }; allow apexd self:global_capability_class_set { sys_admin chown dac_override dac_read_search fowner };
# Note: fsetid is deliberately not included above. fsetid checks are # Note: fsetid is deliberately not included above. fsetid checks are
# triggered by chmod on a directory or file owned by a group other # triggered by chmod on a directory or file owned by a group other
@ -139,6 +139,9 @@ create_pty(apexd)
# Allow apexd to read file contexts when performing restorecon of snapshots. # Allow apexd to read file contexts when performing restorecon of snapshots.
allow apexd file_contexts_file:file r_file_perms; allow apexd file_contexts_file:file r_file_perms;
# Allow apexd to execute toybox for snapshot & restore
allow apexd toolbox_exec:file rx_file_perms;
neverallow { domain -apexd -init } apex_data_file:dir no_w_dir_perms; neverallow { domain -apexd -init } apex_data_file:dir no_w_dir_perms;
neverallow { domain -apexd -init } apex_metadata_file:dir no_w_dir_perms; neverallow { domain -apexd -init } apex_metadata_file:dir no_w_dir_perms;
neverallow { domain -apexd -init -kernel } apex_data_file:file no_w_file_perms; neverallow { domain -apexd -init -kernel } apex_data_file:file no_w_file_perms;