Merge "allow system_server to access files under /sys/kernel/ion/" am: a8ca12d1c0 am: 6a306acedd

Change-Id: I048be37c1d8cefd01c398dcfbe4be897f163ea2c
This commit is contained in:
Automerger Merge Worker 2019-12-17 23:15:41 +00:00
commit 5c515f5d03
4 changed files with 6 additions and 0 deletions

View file

@ -1744,6 +1744,7 @@
(typeattributeset swap_block_device_29_0 (swap_block_device))
(typeattributeset sysfs_29_0
( sysfs
sysfs_ion
sysfs_suspend_stats
sysfs_wakeup))
(typeattributeset sysfs_android_usb_29_0 (sysfs_android_usb))

View file

@ -139,6 +139,7 @@ genfscon sysfs /power/wakeup_count u:object_r:sysfs_power:s0
genfscon sysfs /power/wake_lock u:object_r:sysfs_wake_lock:s0
genfscon sysfs /power/wake_unlock u:object_r:sysfs_wake_lock:s0
genfscon sysfs /kernel/memory_state_time u:object_r:sysfs_power:s0
genfscon sysfs /kernel/ion u:object_r:sysfs_ion:s0
genfscon sysfs /kernel/ipv4 u:object_r:sysfs_ipv4:s0
genfscon sysfs /kernel/mm/transparent_hugepage u:object_r:sysfs_transparent_hugepage:s0
genfscon sysfs /kernel/notes u:object_r:sysfs_kernel_notes:s0

View file

@ -160,6 +160,9 @@ allow system_server stats_data_file:file unlink;
# Read /sys/kernel/debug/wakeup_sources.
allow system_server debugfs_wakeup_sources:file r_file_perms;
# Read /sys/kernel/ion/*.
allow system_server sysfs_ion:file r_file_perms;
# The DhcpClient and WifiWatchdog use packet_sockets
allow system_server self:packet_socket create_socket_perms_no_ioctl;

View file

@ -83,6 +83,7 @@ type sysfs_devices_block, fs_type, sysfs_type;
type sysfs_dm, fs_type, sysfs_type;
type sysfs_dt_firmware_android, fs_type, sysfs_type;
type sysfs_extcon, fs_type, sysfs_type;
type sysfs_ion, fs_type, sysfs_type;
type sysfs_ipv4, fs_type, sysfs_type;
type sysfs_kernel_notes, fs_type, sysfs_type, mlstrustedobject;
type sysfs_leds, fs_type, sysfs_type;