commit f39ea2f209ec8448496cf1d9728a6db3737ec90a
author Paul Lawrence <paullawrence@google.com> Mon Nov 07 15:07:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 07 15:07:22 2016 +0000
tree 20e934a6399896f1419ebe4d887b18b883e21e00
parent a8da6e50a9f119831d2176dad3b2f3c43fce8832
parent 559f01dd716310d78f6b2ddd618a16f9a52d7f79

Merge "Fix selinux warning on tracefs systems"
am: 0ad600bdc6

Change-Id: Ibaab6580caf0fe216cfae72bf5d2560fec02afdf

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0eb7f0b..ef3c8f9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -307,6 +307,10 @@
     # Make sure /sys/kernel/debug (if present) is labeled properly
     restorecon_recursive /sys/kernel/debug
 
+    # On systems with tracefs, tracing is a separate mount, so make sure
+    # it too is correctly labeled
+    restorecon_recursive /sys/kernel/debug/tracing
+
     # We chown/chmod /cache again so because mount is run as root + defaults
     chown system cache /cache
     chmod 0770 /cache