sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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

« mojo/public/tools/BUILD.gn ('K') | « sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ('k') | sandbox/linux/seccomp-bpf-helpers/syscall_sets.h » ('j') | sky/engine/bindings/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c081b29cad7a142725b86cb2f39fdff7d27abd5a..282e72775d3441ba3a101483bd51a2b0b0f6a2f7 100644

--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc

+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc

@@ -7,10 +7,10 @@

#include <errno.h>

#include <fcntl.h>

-#include <linux/futex.h>

#include <linux/net.h>

#include <sched.h>

#include <signal.h>

+#include <stdint.h>

#include <sys/ioctl.h>

#include <sys/mman.h>

#include <sys/prctl.h>

@@ -21,7 +21,6 @@

#include <time.h>

#include <unistd.h>

-#include "base/basictypes.h"

#include "base/logging.h"

#include "base/macros.h"

#include "base/time/time.h"

@@ -30,12 +29,11 @@

#include "sandbox/linux/bpf_dsl/seccomp_macros.h"

#include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"

#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"

+#include "sandbox/linux/system_headers/linux_futex.h"

#include "sandbox/linux/system_headers/linux_syscalls.h"

#if defined(OS_ANDROID)

-#include "sandbox/linux/system_headers/android_futex.h"

#if !defined(F_DUPFD_CLOEXEC)

#define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6)

#endif

« mojo/public/tools/BUILD.gn ('K') | « sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ('k') | sandbox/linux/seccomp-bpf-helpers/syscall_sets.h » ('j') | sky/engine/bindings/BUILD.gn » ('J')