Merge "Allow restart_syscall" am: 1b3350e4ca
am: 5b0dd3cbe3
Change-Id: Ibd386810c4d6d2f955ff76e69c71b67101ec6c08
diff --git a/init/seccomp.cpp b/init/seccomp.cpp
index d9f2f79..b7744b6 100644
--- a/init/seccomp.cpp
+++ b/init/seccomp.cpp
@@ -170,6 +170,9 @@
// Needed for trusty
AllowSyscall(f, __NR_syncfs);
+ // Needed for kernel to restart syscalls
+ AllowSyscall(f, __NR_restart_syscall);
+
// arm64-only filter - autogenerated from bionic syscall usage
for (size_t i = 0; i < arm64_filter_size; ++i)
f.push_back(arm64_filter[i]);
@@ -201,6 +204,9 @@
// Syscalls needed to run GFXBenchmark
AllowSyscall(f, 190); // __NR_vfork
+ // Needed for kernel to restart syscalls
+ AllowSyscall(f, 0); // __NR_restart_syscall
+
// arm32-on-arm64 only filter - autogenerated from bionic syscall usage
for (size_t i = 0; i < arm_filter_size; ++i)
f.push_back(arm_filter[i]);