Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1276)

Unified Diff: sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index 60c16d37302b880a63db88fcd2ebbbcb97f6a1da..58ffb843a8717c9f659d95db465b0c56a9f3a3b3 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -30,6 +30,7 @@
#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
#include "sandbox/linux/system_headers/linux_futex.h"
#include "sandbox/linux/system_headers/linux_syscalls.h"
+#include "sandbox/linux/system_headers/linux_time.h"
// PNaCl toolchain does not provide sys/ioctl.h header.
#if !defined(OS_NACL_NONSFI)
@@ -304,11 +305,13 @@ ResultExpr RestrictClockID() {
return If(
#if defined(OS_CHROMEOS)
// Allow the special clock for Chrome OS used by Chrome tracing.
- clockid == base::TimeTicks::kClockSystemTrace ||
+ clockid == base::TraceTicks::kClockSystemTrace ||
#endif
clockid == CLOCK_MONOTONIC ||
+ clockid == CLOCK_MONOTONIC_COARSE ||
clockid == CLOCK_PROCESS_CPUTIME_ID ||
clockid == CLOCK_REALTIME ||
+ clockid == CLOCK_REALTIME_COARSE ||
clockid == CLOCK_THREAD_CPUTIME_ID,
Allow()).Else(CrashSIGSYS());
}

Powered by Google App Engine
This is Rietveld 408576698