Merge "Allow only system_server to read uid_time_in_state" am: 439364d20e

am: e96aad0998

Change-Id: I0742836c6b613afeab2dcf6d59c37dd9787dc91a
This commit is contained in:
Andres Oportus 2017-07-01 12:59:05 +00:00 committed by android-build-merger
commit 3ce2c6f866
3 changed files with 5 additions and 0 deletions

View file

@ -40,6 +40,7 @@ genfscon proc /uid_cputime/show_uid_stat u:object_r:proc_uid_cputime_showstat:s0
genfscon proc /uid_cputime/remove_uid_range u:object_r:proc_uid_cputime_removeuid:s0
genfscon proc /uid_io/stats u:object_r:proc_uid_io_stats:s0
genfscon proc /uid_procstat/set u:object_r:proc_uid_procstat_set:s0
genfscon proc /uid_time_in_state u:object_r:proc_uid_time_in_state:s0
genfscon proc /zoneinfo u:object_r:proc_zoneinfo:s0
# selinuxfs booleans can be individually labeled.

View file

@ -130,6 +130,9 @@ allow system_server proc_uid_cputime_removeuid:file { w_file_perms getattr };
# Write /proc/uid_procstat/set.
allow system_server proc_uid_procstat_set:file { w_file_perms getattr };
# Read /proc/uid_time_in_state.
allow system_server proc_uid_time_in_state:file r_file_perms;
# Write to /proc/sysrq-trigger.
allow system_server proc_sysrq:file rw_file_perms;

View file

@ -28,6 +28,7 @@ type proc_uid_cputime_showstat, fs_type;
type proc_uid_cputime_removeuid, fs_type;
type proc_uid_io_stats, fs_type;
type proc_uid_procstat_set, fs_type;
type proc_uid_time_in_state, fs_type;
type proc_zoneinfo, fs_type;
type selinuxfs, fs_type, mlstrustedobject;
type cgroup, fs_type, mlstrustedobject;