content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc - Issue 759473002: Linux sandbox: change seccomp detection and initialization.

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: content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc

Issue 759473002: Linux sandbox: change seccomp detection and initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_startsandbox

Patch Set: Get rid of SeccompLevel::INVALID Created 6 years, 1 month 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

« no previous file with comments | « components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc ('k') | content/renderer/renderer_main_platform_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc

diff --git a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc

index 6646e8235c21c545dfe4372b6aba94bf64553093..71138582c85f83d66cb93a7b1f09a478ec8413ae 100644

--- a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc

+++ b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc

@@ -158,7 +158,7 @@ void StartSandboxWithPolicy(sandbox::bpf_dsl::Policy* policy,

sandbox.SetSandboxPolicy(policy);

sandbox.set_proc_task_fd(proc_task_fd.release());

- CHECK(sandbox.StartSandbox(SandboxBPF::PROCESS_SINGLE_THREADED));

+ CHECK(sandbox.StartSandbox(SandboxBPF::SeccompLevel::SINGLE_THREADED));

}

// nacl_helper needs to be tiny and includes only part of content/

@@ -253,11 +253,8 @@ bool SandboxSeccompBPF::ShouldEnableSeccompBPF(

bool SandboxSeccompBPF::SupportsSandbox() {

#if defined(USE_SECCOMP_BPF)

- SandboxBPF::SandboxStatus bpf_sandbox_status =

- SandboxBPF::SupportsSeccompSandbox();

- if (bpf_sandbox_status == SandboxBPF::STATUS_AVAILABLE) {

- return true;

- }

+ return SandboxBPF::SupportsSeccompSandbox(

+ SandboxBPF::SeccompLevel::SINGLE_THREADED);

#endif

return false;

}