Skip to content
Snippets Groups Projects
Commit 97b955de authored by Andres Oportus's avatar Andres Oportus Committed by Jeff Vander Stoep
Browse files

Allow only system_server to read uid_time_in_state

Bug: 62706738
Bug: 34133340
Test: Check that uid_time_in_state can't be read from
the shell without root permissions and that
"dumpsys batterystats --checkin| grep ctf" shows frequency
data (system_server was able to read uid_time_in_state)

Change-Id: Ic6a54da4ebcc9e10b0e3af8f14a45d7408e8686e
(cherry picked from commit 4dc88795)
parent 2be9799b
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,7 @@ genfscon proc /uid_cputime/show_uid_stat u:object_r:proc_uid_cputime_showstat:s0 ...@@ -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_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_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_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 genfscon proc /zoneinfo u:object_r:proc_zoneinfo:s0
# selinuxfs booleans can be individually labeled. # selinuxfs booleans can be individually labeled.
......
...@@ -126,6 +126,9 @@ allow system_server proc_uid_cputime_removeuid:file { w_file_perms getattr }; ...@@ -126,6 +126,9 @@ allow system_server proc_uid_cputime_removeuid:file { w_file_perms getattr };
# Write /proc/uid_procstat/set. # Write /proc/uid_procstat/set.
allow system_server proc_uid_procstat_set:file { w_file_perms getattr }; 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. # Write to /proc/sysrq-trigger.
allow system_server proc_sysrq:file rw_file_perms; allow system_server proc_sysrq:file rw_file_perms;
......
...@@ -28,6 +28,7 @@ type proc_uid_cputime_showstat, fs_type; ...@@ -28,6 +28,7 @@ type proc_uid_cputime_showstat, fs_type;
type proc_uid_cputime_removeuid, fs_type; type proc_uid_cputime_removeuid, fs_type;
type proc_uid_io_stats, fs_type; type proc_uid_io_stats, fs_type;
type proc_uid_procstat_set, fs_type; type proc_uid_procstat_set, fs_type;
type proc_uid_time_in_state, fs_type;
type proc_zoneinfo, fs_type; type proc_zoneinfo, fs_type;
type selinuxfs, fs_type, mlstrustedobject; type selinuxfs, fs_type, mlstrustedobject;
type cgroup, fs_type, mlstrustedobject; type cgroup, fs_type, mlstrustedobject;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment