| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/renderer_main_platform_delegate.h" | 5 #include "chrome/renderer/renderer_main_platform_delegate.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug_util.h" | 8 #include "base/debug_util.h" |
| 9 #include "sandbox/linux/seccomp/sandbox.h" | 9 #include "sandbox/linux/seccomp/sandbox.h" |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 bool RendererMainPlatformDelegate::EnableSandbox() { | 33 bool RendererMainPlatformDelegate::EnableSandbox() { |
| 34 // The setuid sandbox is started in the zygote process: zygote_main_linux.cc | 34 // The setuid sandbox is started in the zygote process: zygote_main_linux.cc |
| 35 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox | 35 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox |
| 36 // | 36 // |
| 37 // The seccomp sandbox is started in the renderer. | 37 // The seccomp sandbox is started in the renderer. |
| 38 // http://code.google.com/p/seccompsandbox/ | 38 // http://code.google.com/p/seccompsandbox/ |
| 39 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) | 39 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) |
| 40 // N.b. SupportsSeccompSandbox() returns a cached result, as we already | 40 // N.b. SupportsSeccompSandbox() returns a cached result, as we already |
| 41 // called it earlier in the zygote. Thus, it is OK for us to not pass in | 41 // called it earlier in the zygote. Thus, it is OK for us to not pass in |
| 42 // a file descriptor for "/proc". | 42 // a file descriptor for "/proc". |
| 43 if (CommandLine::ForCurrentProcess()->HasSwitch( | 43 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 44 switches::kEnableSeccompSandbox) && | 44 switches::kDisableSeccompSandbox)) { |
| 45 SupportsSeccompSandbox(-1)) { | |
| 46 StartSeccompSandbox(); | 45 StartSeccompSandbox(); |
| 47 } | 46 } |
| 48 #endif | 47 #endif |
| 49 return true; | 48 return true; |
| 50 } | 49 } |
| 51 | 50 |
| 52 void RendererMainPlatformDelegate::RunSandboxTests() { | 51 void RendererMainPlatformDelegate::RunSandboxTests() { |
| 53 // The sandbox is started in the zygote process: zygote_main_linux.cc | 52 // The sandbox is started in the zygote process: zygote_main_linux.cc |
| 54 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox | 53 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox |
| 55 } | 54 } |
| OLD | NEW |