Disable the seccomp filter GPU process sandbox by default on Chrome OS.

content/common/sandbox_init_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/sandbox_init.h"
 
 #if defined(OS_LINUX) && defined(__x86_64__)
 
 #include <asm/unistd.h>
 #include <errno.h>
@@ skipping 370 matching lines @@
   PLOG_IF(FATAL, ret != 0) << "prctl(PR_SET_NO_NEW_PRIVS) failed";
 
   struct sock_fprog fprog;
   fprog.len = program.size();
   fprog.filter = const_cast<struct sock_filter*>(&program[0]);
 
   ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &fprog, 0, 0);
   PLOG_IF(FATAL, ret != 0) << "Failed to install filter.";
 }
 
+static bool ShouldEnableGPUSandbox() {
+  bool res = false;
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+
+  res = !command_line.HasSwitch(switches::kDisableGpuSandbox);
+#if defined(OS_CHROMEOS)

[Chris Evans, 2012/06/11 20:52:23]

Can you get rid of this ifdef? If we have to pull the sandbox from e.g. binary
Nvidia driver on desktop Linux, I want this flag to work by default.

In terms of conflict, "disable" should win.

[Jorge Lucangeli Obes, 2012/06/11 22:56:46]

Done.

+  res = command_line.HasSwitch(switches::kEnableGpuSandbox);
+#endif
+  return res;
+}
+
 }  // anonymous namespace
 
 namespace content {
 
 void InitializeSandbox() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kNoSandbox) ||
       command_line.HasSwitch(switches::kDisableSeccompFilterSandbox))
     return;
 
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
   if (process_type == switches::kGpuProcess &&
-      command_line.HasSwitch(switches::kDisableGpuSandbox))
+      !ShouldEnableGPUSandbox())
     return;
 
   if (!CanUseSeccompFilters())
     return;
 
   CheckSingleThreaded();
 
   std::vector<struct sock_filter> program;
   EmitPreamble(&program);
 
@@ skipping 20 matching lines @@
 #else
 
 namespace content {
 
 void InitializeSandbox() {
 }
 
 }  // namespace content
 
 #endif
-