summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 22:20:34 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 22:20:34 +0000
commit9a9805d494f06037618cbd966a08c4602a04b53f (patch)
tree7c46a7a10b64e649c642a36379b24eb63754634d
parentd8c63900a19a8d967d01bfad1c7c25bb54436dbc (diff)
downloadchromium_src-9a9805d494f06037618cbd966a08c4602a04b53f.zip
chromium_src-9a9805d494f06037618cbd966a08c4602a04b53f.tar.gz
chromium_src-9a9805d494f06037618cbd966a08c4602a04b53f.tar.bz2
Disable the seccomp-bpf sandbox on ARM temporarily.
BUG=148856 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10917249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156904 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/common/sandbox_seccomp_bpf_linux.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/content/common/sandbox_seccomp_bpf_linux.cc b/content/common/sandbox_seccomp_bpf_linux.cc
index f7f1a80..a2e7569 100644
--- a/content/common/sandbox_seccomp_bpf_linux.cc
+++ b/content/common/sandbox_seccomp_bpf_linux.cc
@@ -1409,12 +1409,17 @@ bool SandboxSeccompBpf::IsSeccompBpfDesired() {
bool SandboxSeccompBpf::ShouldEnableSeccompBpf(
const std::string& process_type) {
#if defined(SECCOMP_BPF_SANDBOX)
+#if defined(__arm__)
+ // We disable the sandbox on ARM for now until crbug.com/148856 is fixed.
+ return false;
+#else
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (process_type == switches::kGpuProcess)
return !command_line.HasSwitch(switches::kDisableGpuSandbox);
return true;
-#endif
+#endif // __arm__
+#endif // process_type
return false;
}