diff --git a/private/file_contexts b/private/file_contexts index 11f85361a0b8cc448cacff77bcc459fb499bdcda..69e4d61335c78a01523902bed27f774209284c1e 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -452,61 +452,6 @@ # LocalTransport (backup) uses this subtree /data/cache/backup(/.*)? u:object_r:cache_private_backup_file:s0 -############################# -# sysfs files -# -/sys/class/leds(/.*)? u:object_r:sysfs_leds:s0 -/sys/devices/platform/nfc-power/nfc_power -- u:object_r:sysfs_nfc_power_writable:s0 -/sys/devices/virtual/block/zram\d+(/.*)? u:object_r:sysfs_zram:s0 -/sys/devices/virtual/block/zram\d+/uevent u:object_r:sysfs_zram_uevent:s0 -/sys/devices/virtual/misc/hw_random(/.*)? u:object_r:sysfs_hwrandom:s0 -/sys/fs/ext4/features(/.*)? u:object_r:sysfs_fs_ext4_features:s0 -/sys/power/wake_lock -- u:object_r:sysfs_wake_lock:s0 -/sys/power/wake_unlock -- u:object_r:sysfs_wake_lock:s0 -/sys/kernel/uevent_helper -- u:object_r:usermodehelper:s0 -/sys/module/lowmemorykiller(/.*)? -- u:object_r:sysfs_lowmemorykiller:s0 -/sys/module/wlan/parameters/fwpath u:object_r:sysfs_wlan_fwpath:s0 -/sys/devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vibrator:s0 - -############################# -# debugfs files -# -/sys/kernel/debug/mmc0(/.*)? u:object_r:debugfs_mmc:s0 - -############################# -# tracefs files -# -/sys/kernel(/debug)?/tracing/buffer_size_kb u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_locked/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_lock/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_transaction/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_transaction_received/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_unlock/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/cpufreq_interactive/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/power/clock_set_rate/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_frequency/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_frequency_limits/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_idle/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_blocked_reason/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_cpu_hotplug/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_switch/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_wakeup/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_direct_reclaim_end/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_kswapd_wake/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/events/lowmemorykiller/enable u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/instances(/.*)? u:object_r:debugfs_tracing_instances:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/options/overwrite u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/options/print-tgid u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/trace u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/trace_clock u:object_r:tracing_shell_writable:s0 -/sys/kernel(/debug)?/tracing/trace_marker u:object_r:debugfs_trace_marker:s0 -/sys/kernel(/debug)?/tracing/tracing_on u:object_r:tracing_shell_writable:s0 - ########################################### # debug-only tracing # diff --git a/private/genfs_contexts b/private/genfs_contexts index a2d9b892fe5b405718f2907a881637abaffb19c8..dfd8d9ccdc4a56981e338d758ff6b63a4f9c1c8a 100644 --- a/private/genfs_contexts +++ b/private/genfs_contexts @@ -48,6 +48,30 @@ genfscon cgroup / u:object_r:cgroup:s0 # sysfs labels can be set by userspace. genfscon sysfs / u:object_r:sysfs:s0 genfscon sysfs /devices/system/cpu u:object_r:sysfs_devices_system_cpu:s0 +genfscon sysfs /class/leds u:object_r:sysfs_leds:s0 +genfscon sysfs /devices/platform/nfc-power/nfc_power u:object_r:sysfs_nfc_power_writable:s0 +genfscon sysfs /devices/virtual/block/zram0 u:object_r:sysfs_zram:s0 +genfscon sysfs /devices/virtual/block/zram1 u:object_r:sysfs_zram:s0 +genfscon sysfs /devices/virtual/block/zram0/uevent u:object_r:sysfs_zram_uevent:s0 +genfscon sysfs /devices/virtual/block/zram1/uevent u:object_r:sysfs_zram_uevent:s0 +genfscon sysfs /devices/virtual/misc/hw_random u:object_r:sysfs_hwrandom:s0 +genfscon sysfs /fs/ext4/features u:object_r:sysfs_fs_ext4_features: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/uevent_helper u:object_r:usermodehelper:s0 +genfscon sysfs /module/lowmemorykiller u:object_r:sysfs_lowmemorykiller:s0 +genfscon sysfs /module/wlan/parameters/fwpath u:object_r:sysfs_wlan_fwpath:s0 +genfscon sysfs /devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vibrator:s0 + +genfscon debugfs /mmc0 u:object_r:debugfs_mmc:s0 +genfscon debugfs /tracing u:object_r:debugfs_tracing:s0 +genfscon debugfs /tracing/instances u:object_r:debugfs_tracing_instances:s0 +genfscon tracefs /instances u:object_r:debugfs_tracing_instances:s0 +genfscon debugfs /tracing/instances/wifi u:object_r:debugfs_wifi_tracing:s0 +genfscon tracefs /instances/wifi u:object_r:debugfs_wifi_tracing:s0 +genfscon debugfs /tracing/trace_marker u:object_r:debugfs_trace_marker:s0 +genfscon tracefs /trace_marker u:object_r:debugfs_trace_marker:s0 + genfscon inotifyfs / u:object_r:inotify:s0 genfscon vfat / u:object_r:vfat:s0 genfscon debugfs / u:object_r:debugfs:s0 diff --git a/private/shell.te b/private/shell.te index 90bed27e7443f84f2862106f720a7c8261188af8..6e691513d706379c82907ee5c613bbe9d5ac7426 100644 --- a/private/shell.te +++ b/private/shell.te @@ -5,8 +5,7 @@ allow shell uhid_device:chr_file rw_file_perms; # systrace support - allow atrace to run allow shell debugfs_tracing:dir r_dir_perms; -allow shell debugfs_tracing:file r_file_perms; -allow shell tracing_shell_writable:file rw_file_perms; +allow shell debugfs_tracing:file rw_file_perms; allow shell debugfs_trace_marker:file getattr; allow shell atrace_exec:file rx_file_perms; diff --git a/public/init.te b/public/init.te index 8abad58a48b5ba6afb9a5230dbba1412c5009ade..b21c4d09e1354b2cb88c1844b52ab743c0d03f1f 100644 --- a/public/init.te +++ b/public/init.te @@ -193,7 +193,7 @@ allow init dev_type:dir create_dir_perms; allow init dev_type:lnk_file create; # Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on -allow init tracing_shell_writable:file w_file_perms; +allow init debugfs_tracing:file w_file_perms; # Setup and control wifi event tracing (see wifi-events.rc) allow init debugfs_tracing_instances:dir create_dir_perms;