tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move watchdogd out of init and into its own domain

Browse source 
Bug: 73660730
Test: watchdogd still runs
Change-Id: I31697c7c6fa2f7009731ff48c659af051838e42f
This commit is contained in:
Tom Cherry 2018-08-01 15:48:20 -07:00
parent 23c9d91b46
commit d840374e65
10 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
private/compat/26.0/26.0.cil
View file

@ -279,7 +279,7 @@
(typeattributeset incident_data_file_26_0 (incident_data_file))
(typeattributeset incident_service_26_0 (incident_service))
(typeattributeset init_26_0 (init))
(typeattributeset init_exec_26_0 (init_exec))
(typeattributeset init_exec_26_0 (init_exec watchdogd_exec))
(typeattributeset inotify_26_0 (inotify))
(typeattributeset input_device_26_0 (input_device))
(typeattributeset inputflinger_26_0 (inputflinger))

1
private/compat/26.0/26.0.ignore.cil
View file

@ -156,6 +156,7 @@
wait_for_keymaster
wait_for_keymaster_exec
wait_for_keymaster_tmpfs
watchdogd_tmpfs
wpantund
wpantund_exec
wpantund_service

2
private/compat/27.0/27.0.cil
View file

@ -993,7 +993,7 @@
(typeattributeset incident_data_file_27_0 (incident_data_file))
(typeattributeset incident_service_27_0 (incident_service))
(typeattributeset init_27_0 (init))
(typeattributeset init_exec_27_0 (init_exec))
(typeattributeset init_exec_27_0 (init_exec watchdogd_exec))
(typeattributeset inotify_27_0 (inotify))
(typeattributeset input_device_27_0 (input_device))
(typeattributeset inputflinger_27_0 (inputflinger))

1
private/compat/27.0/27.0.ignore.cil
View file

@ -131,6 +131,7 @@
wait_for_keymaster
wait_for_keymaster_exec
wait_for_keymaster_tmpfs
watchdogd_tmpfs
wm_trace_data_file
wpantund
wpantund_exec

2
private/compat/28.0/28.0.cil
View file

@ -1177,7 +1177,7 @@
(typeattributeset incident_helper_28_0 (incident_helper))
(typeattributeset incident_service_28_0 (incident_service))
(typeattributeset init_28_0 (init))
(typeattributeset init_exec_28_0 (init_exec))
(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
(typeattributeset inotify_28_0 (inotify))
(typeattributeset input_device_28_0 (input_device))
(typeattributeset inputflinger_28_0 (inputflinger))

3
private/compat/28.0/28.0.ignore.cil
View file

@ -13,4 +13,5 @@
timedetector_service
timezonedetector_service
uri_grants_service
vrflinger_vsync_service))
vrflinger_vsync_service
watchdogd_tmpfs))

1
private/file_contexts
View file

@ -296,6 +296,7 @@
/system/bin/statsd u:object_r:statsd_exec:s0
/system/bin/bpfloader u:object_r:bpfloader_exec:s0
/system/bin/wait_for_keymaster u:object_r:wait_for_keymaster_exec:s0
/system/bin/watchdogd u:object_r:watchdogd_exec:s0
#############################
# Vendor files

1
private/init.te
View file

@ -13,7 +13,6 @@ recovery_only(`
')
domain_trans(init, shell_exec, shell)
domain_trans(init, init_exec, ueventd)
domain_trans(init, init_exec, watchdogd)
domain_trans(init, init_exec, vendor_init)
domain_trans(init, { rootfs toolbox_exec }, modprobe)
# case where logpersistd is actually logcat -f in logd context (nee: logcatd)

2
private/watchdogd.te
View file

@ -1 +1,3 @@
typeattribute watchdogd coredomain;
init_daemon_domain(watchdogd)

2
public/watchdogd.te
View file

@ -1,4 +1,6 @@
# watchdogd seclabel is specified in init.<board>.rc
type watchdogd, domain;
type watchdogd_exec, exec_type, file_type;
allow watchdogd watchdog_device:chr_file rw_file_perms;
allow watchdogd kmsg_device:chr_file rw_file_perms;