summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-15 22:09:19 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-15 22:09:19 +0000
commit125e23a2a2b3aa2a017e97c5cb54357a0ccdcf0b (patch)
treeb330df4f7f3485b8614c3f7ac8a2a08a6e041135
parent8c8d08209842d91a1ef1b59e7798e18e75dac31b (diff)
parent71429a9738471920772df0d5d50a820aa0d50fbe (diff)
downloadcore-125e23a2a2b3aa2a017e97c5cb54357a0ccdcf0b.tar.gz
Snap for 8084085 from 71429a9738471920772df0d5d50a820aa0d50fbe to sc-v2-release
Change-Id: I5d88fbb0d4dad9e8dc64e1edc789b8a70786a420
-rw-r--r--libcutils/include/private/android_filesystem_config.h1
-rw-r--r--rootdir/init.rc4
2 files changed, 3 insertions, 2 deletions
diff --git a/libcutils/include/private/android_filesystem_config.h b/libcutils/include/private/android_filesystem_config.h
index 8f22d8983..ffd4d1285 100644
--- a/libcutils/include/private/android_filesystem_config.h
+++ b/libcutils/include/private/android_filesystem_config.h
@@ -157,6 +157,7 @@
#define AID_READPROC 3009 /* Allow /proc read access */
#define AID_WAKELOCK 3010 /* Allow system wakelock read/write access */
#define AID_UHID 3011 /* Allow read/write to /dev/uhid node */
+#define AID_READTRACEFS 3012 /* Allow tracefs read */
/* The range 5000-5999 is also reserved for vendor partition. */
#define AID_OEM_RESERVED_2_START 5000
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3f5876f48..5116c0fea 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -78,8 +78,8 @@ on early-init
mkdir /dev/boringssl 0755 root root
mkdir /dev/boringssl/selftest 0755 root root
- # Mount tracefs
- mount tracefs tracefs /sys/kernel/tracing
+ # Mount tracefs (with GID=AID_READTRACEFS)
+ mount tracefs tracefs /sys/kernel/tracing gid=3012
# create sys dirctory
mkdir /dev/sys 0755 system system