commit 586703a90cff369df95fcf5dd14806177f0e6849
author Steven Moreland <smoreland@google.com> Tue Oct 18 20:06:41 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 20:06:41 2022 +0000
tree 1d7515934078eb394e1332719a43332388c9fec8
parent 59f3e115749c2136468543abfe8b5c50cc256bb2
parent 5c3f3157714d99f663ecf10a04d05fbd982a6214

Merge "servicemanager: kernel log perms"

public/servicemanager.te

diff --git a/public/servicemanager.te b/public/servicemanager.te
index a812338..58153f7 100644
--- a/public/servicemanager.te
+++ b/public/servicemanager.te
@@ -31,10 +31,9 @@
 # Check SELinux permissions.
 selinux_check_access(servicemanager)
 
-recovery_only(`
-  # In recovery, log to kmsg.
-  allow servicemanager kmsg_device:chr_file rw_file_perms;
+allow servicemanager kmsg_device:chr_file rw_file_perms;
 
+recovery_only(`
   # Read VINTF files.
   r_dir_file(servicemanager, rootfs)
 ')

vendor/vndservicemanager.te

diff --git a/vendor/vndservicemanager.te b/vendor/vndservicemanager.te
index 497e027..2ad0502 100644
--- a/vendor/vndservicemanager.te
+++ b/vendor/vndservicemanager.te
@@ -20,3 +20,6 @@
 
 # Check SELinux permissions.
 selinux_check_access(vndservicemanager)
+
+# Log to kmesg
+allow vndservicemanager kmsg_device:chr_file rw_file_perms;