commit 7bb0d3b20345ee0fccf01d7ca2a4f941cb4ecefb
author Colin Cross <ccross@android.com> Tue Jan 24 04:45:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 24 04:45:24 2017 +0000
tree 86cf8658a7c2c406b4a91a77ea2d9722e96d95cc
parent 1071bf7f950da368321d256c84ae4186649f5298
parent 596bc746f8c95b50073051d17fed23c120682c0d

Merge "Allow tkill" am: 9fd1190790 am: 81b76391d3 am: 33d0bb6483
am: 781a9f5b7e

Change-Id: Ia91bf6d21ca241d825753834e8c2d1cfa7c591eb

init/seccomp.cpp

diff --git a/init/seccomp.cpp b/init/seccomp.cpp
index b7744b6..d632302 100644
--- a/init/seccomp.cpp
+++ b/init/seccomp.cpp
@@ -170,6 +170,9 @@
     // Needed for trusty
     AllowSyscall(f, __NR_syncfs);
 
+    // Needed for strace
+    AllowSyscall(f, __NR_tkill);  // __NR_tkill
+
     // Needed for kernel to restart syscalls
     AllowSyscall(f, __NR_restart_syscall);
 
@@ -204,6 +207,9 @@
     // Syscalls needed to run GFXBenchmark
     AllowSyscall(f, 190); // __NR_vfork
 
+    // Needed for strace
+    AllowSyscall(f, 238);  // __NR_tkill
+
     // Needed for kernel to restart syscalls
     AllowSyscall(f, 0);  // __NR_restart_syscall