Skip to content
Snippets Groups Projects
Commit cbb6ef7e authored by mukesh agrawal's avatar mukesh agrawal Committed by android-build-merger
Browse files

allow init and system_server access to tracing 

am: 3a6bc68e

Change-Id: I5093aac7ab27de22671c458cc963878cf108cc9d
parents 2e598990 3a6bc68e
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
private/file_contexts
+ 7
− 3
View file @ cbb6ef7e
...@@ -436,6 +436,10 @@ ...@@ -436,6 +436,10 @@
/sys/kernel/debug/mmc0(/.*)? u:object_r:debugfs_mmc:s0 /sys/kernel/debug/mmc0(/.*)? u:object_r:debugfs_mmc:s0
/sys/kernel/debug/tracing(/.*)? u:object_r:debugfs_tracing:s0 /sys/kernel/debug/tracing(/.*)? u:object_r:debugfs_tracing:s0
/sys/kernel/debug/tracing/trace_marker u:object_r:debugfs_trace_marker:s0 /sys/kernel/debug/tracing/trace_marker u:object_r:debugfs_trace_marker: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
############################# #############################
# asec containers # asec containers
......
public/file.te
+ 2
− 0
View file @ cbb6ef7e
...@@ -62,6 +62,8 @@ type debugfs, fs_type; ...@@ -62,6 +62,8 @@ type debugfs, fs_type;
type debugfs_mmc, fs_type, debugfs_type; type debugfs_mmc, fs_type, debugfs_type;
type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject; type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject;
type debugfs_tracing, fs_type, debugfs_type; type debugfs_tracing, fs_type, debugfs_type;
type debugfs_tracing_instances, fs_type, debugfs_type;
type debugfs_wifi_tracing, fs_type, debugfs_type;
type pstorefs, fs_type; type pstorefs, fs_type;
type functionfs, fs_type, mlstrustedobject; type functionfs, fs_type, mlstrustedobject;
type oemfs, fs_type, contextmount_type; type oemfs, fs_type, contextmount_type;
......
public/init.te
+ 7
− 0
View file @ cbb6ef7e
...@@ -180,6 +180,13 @@ allow init dev_type:lnk_file create; ...@@ -180,6 +180,13 @@ allow init dev_type:lnk_file create;
# Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on # Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on
allow init debugfs_tracing:file w_file_perms; allow init debugfs_tracing:file w_file_perms;
userdebug_or_eng(`
# Setup and control wifi event tracing (see wifi-events.rc)
allow init debugfs_tracing_instances:dir create_dir_perms;
allow init debugfs_tracing_instances:file w_file_perms;
allow init debugfs_wifi_tracing:file w_file_perms;
')
# chown/chmod on pseudo files. # chown/chmod on pseudo files.
allow init { fs_type -contextmount_type -sdcard_type -rootfs }:file { open read setattr }; allow init { fs_type -contextmount_type -sdcard_type -rootfs }:file { open read setattr };
allow init { fs_type -contextmount_type -sdcard_type -rootfs }:dir { open read setattr search }; allow init { fs_type -contextmount_type -sdcard_type -rootfs }:dir { open read setattr search };
......
public/system_server.te
+ 6
− 0
View file @ cbb6ef7e
...@@ -603,6 +603,12 @@ r_dir_file(system_server, sysfs_type) ...@@ -603,6 +603,12 @@ r_dir_file(system_server, sysfs_type)
# Allow system_server to make binder calls to hwservicemanager # Allow system_server to make binder calls to hwservicemanager
binder_call(system_server, hwservicemanager) binder_call(system_server, hwservicemanager)
userdebug_or_eng(`
# Allow WifiService to start, stop, and read wifi-specific trace events.
allow system_server debugfs_tracing_instances:dir search;
allow system_server debugfs_wifi_tracing:file rw_file_perms;
')
### ###
### Neverallow rules ### Neverallow rules
### ###
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment