Merge "Label /dev/socket/zygote_secondary"
diff --git a/adbd.te b/adbd.te
index 44607c7..4b67647 100644
--- a/adbd.te
+++ b/adbd.te
@@ -3,6 +3,7 @@
type adbd, domain;
userdebug_or_eng(`
+ allow adbd self:process setcurrent;
allow adbd su:process dyntransition;
')
diff --git a/app.te b/app.te
index 3615306..7e53724 100644
--- a/app.te
+++ b/app.te
@@ -15,7 +15,8 @@
allow appdomain zygote:fd use;
# gdbserver for ndk-gdb reads the zygote.
-allow appdomain zygote_exec:file r_file_perms;
+# valgrind needs mmap exec for zygote
+allow appdomain zygote_exec:file rx_file_perms;
# gdbserver for ndk-gdb ptrace attaches to app process.
allow appdomain self:process ptrace;
diff --git a/domain.te b/domain.te
index 5fef04b..f7e8692 100644
--- a/domain.te
+++ b/domain.te
@@ -11,7 +11,7 @@
allow domain tmpfs:dir r_dir_perms;
# Intra-domain accesses.
-allow domain self:process ~{ execmem execstack execheap ptrace };
+allow domain self:process ~{ execmem execstack execheap ptrace setexec setfscreate setcurrent setkeycreate setsockcreate };
allow domain self:fd use;
allow domain self:dir r_dir_perms;
allow domain self:lnk_file r_file_perms;
diff --git a/init.te b/init.te
index 3441dd0..e94ca47 100644
--- a/init.te
+++ b/init.te
@@ -27,3 +27,9 @@
# the directory as part of a recursive restorecon.
allow init keystore_data_file:dir { open create read getattr setattr search };
allow init keystore_data_file:file { getattr };
+
+# Use setexeccon(), setfscreatecon(), and setsockcreatecon().
+# setexec is for services with seclabel options.
+# setfscreate is for labeling directories and socket files.
+# setsockcreate is for labeling local/unix domain sockets.
+allow init self:process { setexec setfscreate setsockcreate };
diff --git a/kernel.te b/kernel.te
index 0048a62..f2405e4 100644
--- a/kernel.te
+++ b/kernel.te
@@ -1,6 +1,8 @@
# Life begins with the kernel.
type kernel, domain;
+# setcon to init domain.
+allow kernel self:process setcurrent;
allow kernel init:process dyntransition;
# The kernel is unconfined.
diff --git a/recovery.te b/recovery.te
index cfec161..c132983 100644
--- a/recovery.te
+++ b/recovery.te
@@ -15,3 +15,6 @@
allow recovery self:process execmem;
allow recovery ashmem_device:chr_file execute;
allow recovery tmpfs:file rx_file_perms;
+
+# Use setfscreatecon() to label files for OTA updates.
+allow recovery self:process setfscreate;
diff --git a/runas.te b/runas.te
index 8648ee7..8cc0eea 100644
--- a/runas.te
+++ b/runas.te
@@ -21,4 +21,5 @@
# read /seapp_contexts and /data/security/seapp_contexts
security_access_policy(runas)
selinux_check_context(runas) # validate context
+allow runas self:process setcurrent;
allow runas non_system_app_set:process dyntransition; # setcon
diff --git a/ueventd.te b/ueventd.te
index babebe0..25460de 100644
--- a/ueventd.te
+++ b/ueventd.te
@@ -20,3 +20,6 @@
allow ueventd self:netlink_kobject_uevent_socket create_socket_perms;
allow ueventd efs_file:dir search;
allow ueventd efs_file:file r_file_perms;
+
+# Use setfscreatecon() to label /dev directories and files.
+allow ueventd self:process setfscreate;
diff --git a/zygote.te b/zygote.te
index 4d169f3..da3a037 100644
--- a/zygote.te
+++ b/zygote.te
@@ -9,6 +9,7 @@
# Drop capabilities from bounding set.
allow zygote self:capability setpcap;
# Switch SELinux context to app domains.
+allow zygote self:process setcurrent;
allow zygote system_server:process dyntransition;
allow zygote appdomain:process dyntransition;
# Allow zygote to read app /proc/pid dirs (b/10455872)