summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorHridya Valsaraju <hridya@google.com>2020-01-30 17:47:21 -0800
committerHridya Valsaraju <hridya@google.com>2020-01-30 17:50:08 -0800
commitdc0c12e5de4dbe1765b9d969974ae58848221102 (patch)
tree582b497c82039cceb360f36c35816a4ccd2edfee /core/jni/fd_utils.cpp
parent0b242c8d77c329e1c3bc28475e86120026212b99 (diff)
Add /sys/kernel/tracing/trace_marker to whitelist
Add /sys/kernel/tracing/trace_marker to whitelist of paths that the zygote is allowed to keep open. It currently contains /sys/kernel/debug/tracing/trace_marker which is only created when debugfs is mounted. tracefs will be mounted at /sys/kernel/tracing when debugfs is not mounted. Test: AtraceHostTest Bug: 148436518 Change-Id: I734120e8c88ba9d5451a1bd1589e084323824285
Diffstat (limited to 'core/jni/fd_utils.cpp')
-rw-r--r--core/jni/fd_utils.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index 1b6d622e917e..ca4735ec665a 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -46,6 +46,7 @@ static const char* kPathWhitelist[] = {
"/dev/socket/webview_zygote",
"/dev/socket/heapprofd",
"/sys/kernel/debug/tracing/trace_marker",
+ "/sys/kernel/tracing/trace_marker",
"/system/framework/framework-res.apk",
"/dev/urandom",
"/dev/ion",