Skip to content
Snippets Groups Projects
Commit de962429 authored by Yi Jin's avatar Yi Jin Committed by android-build-merger
Browse files

Selinux permissions for incidentd project am: bc24ba72 am: 6c112fb3

am: cf06833c

Change-Id: I5835260d115aab09c5107130240e2c4988b192b7
parents 32d20170 cf06833c
No related branches found
No related tags found
No related merge requests found
...@@ -124,7 +124,10 @@ ...@@ -124,7 +124,10 @@
(typeattributeset dalvikcache_data_file_26_0 (dalvikcache_data_file)) (typeattributeset dalvikcache_data_file_26_0 (dalvikcache_data_file))
(typeattributeset dalvik_prop_26_0 (dalvik_prop)) (typeattributeset dalvik_prop_26_0 (dalvik_prop))
(typeattributeset dbinfo_service_26_0 (dbinfo_service)) (typeattributeset dbinfo_service_26_0 (dbinfo_service))
(typeattributeset debugfs_26_0 (debugfs)) (typeattributeset debugfs_26_0
( debugfs
debugfs_wakeup_sources
))
(typeattributeset debugfs_mmc_26_0 (debugfs_mmc)) (typeattributeset debugfs_mmc_26_0 (debugfs_mmc))
(typeattributeset debugfs_trace_marker_26_0 (debugfs_trace_marker)) (typeattributeset debugfs_trace_marker_26_0 (debugfs_trace_marker))
(typeattributeset debugfs_tracing_26_0 (debugfs_tracing)) (typeattributeset debugfs_tracing_26_0 (debugfs_tracing))
......
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
hal_wifi_hostapd_hwservice hal_wifi_hostapd_hwservice
hal_usb_gadget_hwservice hal_usb_gadget_hwservice
hal_wifi_offload_hwservice hal_wifi_offload_hwservice
incident_helper
incident_helper_exec
kmsg_debug_device kmsg_debug_device
last_boot_reason_prop last_boot_reason_prop
lowpan_device lowpan_device
......
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
/system/bin/dumpstate u:object_r:dumpstate_exec:s0 /system/bin/dumpstate u:object_r:dumpstate_exec:s0
/system/bin/incident u:object_r:incident_exec:s0 /system/bin/incident u:object_r:incident_exec:s0
/system/bin/incidentd u:object_r:incidentd_exec:s0 /system/bin/incidentd u:object_r:incidentd_exec:s0
/system/bin/incident_helper u:object_r:incident_helper_exec:s0
/system/bin/netutils-wrapper-1\.0 u:object_r:netutils_wrapper_exec:s0 /system/bin/netutils-wrapper-1\.0 u:object_r:netutils_wrapper_exec:s0
/system/bin/vold u:object_r:vold_exec:s0 /system/bin/vold u:object_r:vold_exec:s0
/system/bin/netd u:object_r:netd_exec:s0 /system/bin/netd u:object_r:netd_exec:s0
......
...@@ -128,6 +128,7 @@ genfscon debugfs /tracing/instances/wifi u:object_r:debugfs_wifi_tr ...@@ -128,6 +128,7 @@ genfscon debugfs /tracing/instances/wifi u:object_r:debugfs_wifi_tr
genfscon tracefs /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 debugfs /tracing/trace_marker u:object_r:debugfs_trace_marker:s0
genfscon tracefs /trace_marker u:object_r:debugfs_trace_marker:s0 genfscon tracefs /trace_marker u:object_r:debugfs_trace_marker:s0
genfscon debugfs /wakeup_sources u:object_r:debugfs_wakeup_sources:s0
genfscon debugfs /tracing/events/sync/enable u:object_r:debugfs_tracing_debug:s0 genfscon debugfs /tracing/events/sync/enable u:object_r:debugfs_tracing_debug:s0
genfscon debugfs /tracing/events/workqueue/enable u:object_r:debugfs_tracing_debug:s0 genfscon debugfs /tracing/events/workqueue/enable u:object_r:debugfs_tracing_debug:s0
......
...@@ -23,3 +23,5 @@ allow incident incident_service:service_manager find; ...@@ -23,3 +23,5 @@ allow incident incident_service:service_manager find;
binder_call(incident, incidentd) binder_call(incident, incidentd)
allow incident incidentd:fifo_file write; allow incident incidentd:fifo_file write;
# only allow incident being called by shell
neverallow { domain -su -shell -incident } incident_exec:file { execute execute_no_trans };
typeattribute incident_helper coredomain;
type incident_helper_exec, exec_type, file_type;
# switch to incident_helper domain for incident_helper command
domain_auto_trans(incidentd, incident_helper_exec, incident_helper)
# use pipe to transmit data from/to incidentd/incident_helper for parsing
allow incident_helper { shell incident incidentd }:fd use;
allow incident_helper { shell incident incidentd }:fifo_file { getattr read write };
# only allow incidentd and shell to call incident_helper
neverallow { domain -incidentd -incident_helper -shell } incident_helper_exec:file { execute execute_no_trans };
typeattribute incidentd coredomain; typeattribute incidentd coredomain;
typeattribute incidentd mlstrustedsubject;
init_daemon_domain(incidentd) init_daemon_domain(incidentd)
type incidentd_exec, exec_type, file_type; type incidentd_exec, exec_type, file_type;
binder_use(incidentd) binder_use(incidentd)
wakelock_use(incidentd) wakelock_use(incidentd)
# Allow setting process priority, protect from OOM killer, and dropping
# privileges by switching UID / GID
# TODO allow incidentd self:global_capability_class_set { setuid setgid sys_resource };
# Allow incidentd to scan through /proc/pid for all processes # Allow incidentd to scan through /proc/pid for all processes
r_dir_file(incidentd, domain) r_dir_file(incidentd, domain)
allow incidentd self:global_capability_class_set { # Allow incidentd to kill incident_helper when timeout
# Send signals to processes allow incidentd incident_helper:process sigkill;
kill
};
# Allow executing files on system, such as: # Allow executing files on system, such as:
# /system/bin/toolbox # /system/bin/toolbox
...@@ -24,6 +19,22 @@ allow incidentd self:global_capability_class_set { ...@@ -24,6 +19,22 @@ allow incidentd self:global_capability_class_set {
allow incidentd system_file:file execute_no_trans; allow incidentd system_file:file execute_no_trans;
allow incidentd toolbox_exec:file rx_file_perms; allow incidentd toolbox_exec:file rx_file_perms;
# section id 2001, allow reading /proc/pagetypeinfo
allow incidentd proc_pagetypeinfo:file r_file_perms;
# section id 2002, allow reading /d/wakeup_sources
allow incidentd debugfs_wakeup_sources:file r_file_perms;
# section id 2003, allow executing top
allow incidentd proc_meminfo:file { open read };
# section id 2004, allow reading /sys/devices/system/cpu/cpufreq/all_time_in_state
allow incidentd sysfs_devices_system_cpu:file r_file_perms;
# section id 2006, allow reading /sys/class/power_supply/bms/battery_type
allow incidentd sysfs_batteryinfo:dir { search };
allow incidentd sysfs_batteryinfo:file r_file_perms;
# Create and write into /data/misc/incidents # Create and write into /data/misc/incidents
allow incidentd incident_data_file:dir rw_dir_perms; allow incidentd incident_data_file:dir rw_dir_perms;
allow incidentd incident_data_file:file create_file_perms; allow incidentd incident_data_file:file create_file_perms;
...@@ -33,7 +44,7 @@ allow incidentd incident_data_file:file create_file_perms; ...@@ -33,7 +44,7 @@ allow incidentd incident_data_file:file create_file_perms;
# Signal java processes to dump their stack and get the results # Signal java processes to dump their stack and get the results
# TODO allow incidentd { appdomain ephemeral_app system_server }:process signal; # TODO allow incidentd { appdomain ephemeral_app system_server }:process signal;
# TODO allow incidentd anr_data_file:dir rw_dir_perms; # TODO allow incidentd anr_data_file:dir create_dir_perms;
# TODO allow incidentd anr_data_file:file create_file_perms; # TODO allow incidentd anr_data_file:file create_file_perms;
# Signal native processes to dump their stack. # Signal native processes to dump their stack.
...@@ -52,7 +63,7 @@ allow incidentd { ...@@ -52,7 +63,7 @@ allow incidentd {
}:process signal; }:process signal;
# Allow incidentd to make binder calls to any binder service # Allow incidentd to make binder calls to any binder service
binder_call(incidentd, binderservicedomain) binder_call(incidentd, system_server)
binder_call(incidentd, appdomain) binder_call(incidentd, appdomain)
# Reading /proc/PID/maps of other processes # Reading /proc/PID/maps of other processes
...@@ -62,7 +73,7 @@ binder_call(incidentd, appdomain) ...@@ -62,7 +73,7 @@ binder_call(incidentd, appdomain)
allow incidentd shell_exec:file rx_file_perms; allow incidentd shell_exec:file rx_file_perms;
# logd access - work to be done is a PII safe log (possibly an event log?) # logd access - work to be done is a PII safe log (possibly an event log?)
# TODO read_logd(incidentd) userdebug_or_eng(`read_logd(incidentd)')
# TODO control_logd(incidentd) # TODO control_logd(incidentd)
# Allow incidentd to find these standard groups of services. # Allow incidentd to find these standard groups of services.
......
...@@ -135,6 +135,7 @@ allow system_server proc_sysrq:file rw_file_perms; ...@@ -135,6 +135,7 @@ allow system_server proc_sysrq:file rw_file_perms;
# Read /sys/kernel/debug/wakeup_sources. # Read /sys/kernel/debug/wakeup_sources.
allow system_server debugfs:file r_file_perms; allow system_server debugfs:file r_file_perms;
allow system_server debugfs_wakeup_sources:file r_file_perms;
# The DhcpClient and WifiWatchdog use packet_sockets # The DhcpClient and WifiWatchdog use packet_sockets
allow system_server self:packet_socket create_socket_perms_no_ioctl; allow system_server self:packet_socket create_socket_perms_no_ioctl;
......
...@@ -112,6 +112,7 @@ type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject; ...@@ -112,6 +112,7 @@ type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject;
type debugfs_tracing, fs_type, debugfs_type, mlstrustedobject; type debugfs_tracing, fs_type, debugfs_type, mlstrustedobject;
type debugfs_tracing_debug, fs_type, debugfs_type, mlstrustedobject; type debugfs_tracing_debug, fs_type, debugfs_type, mlstrustedobject;
type debugfs_tracing_instances, fs_type, debugfs_type; type debugfs_tracing_instances, fs_type, debugfs_type;
type debugfs_wakeup_sources, fs_type, debugfs_type;
type debugfs_wifi_tracing, fs_type, debugfs_type; type debugfs_wifi_tracing, fs_type, debugfs_type;
type pstorefs, fs_type; type pstorefs, fs_type;
......
# The incident_helper is called by incidentd and
# can only read/write data from/to incidentd
# incident_helper
type incident_helper, domain;
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