summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:36:02 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:36:02 +0000
commit570575f6a60d7fad9a5c9e190b3300b176e34f0f (patch)
tree961b2c500d7628b474b08e46084c1a1ed3dbf71f
parent2ef3748fe99bb8435212b740649e4be1e25d3d48 (diff)
downloadchromium_src-570575f6a60d7fad9a5c9e190b3300b176e34f0f.zip
chromium_src-570575f6a60d7fad9a5c9e190b3300b176e34f0f.tar.gz
chromium_src-570575f6a60d7fad9a5c9e190b3300b176e34f0f.tar.bz2
nacl: disable seccomp initialization in NaClMain()
It fails when seccomp is available; it appears like the code was just copied from RendererMain without it working yet. BUG=59423 TEST=nacl tests still pass when seccomp is on by default (because this disables seccomp for nacl) Review URL: http://codereview.chromium.org/3845008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/nacl/nacl_main_platform_delegate_linux.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/nacl/nacl_main_platform_delegate_linux.cc b/chrome/nacl/nacl_main_platform_delegate_linux.cc
index 9e3acef..33b3438 100644
--- a/chrome/nacl/nacl_main_platform_delegate_linux.cc
+++ b/chrome/nacl/nacl_main_platform_delegate_linux.cc
@@ -34,14 +34,16 @@ void NaClMainPlatformDelegate::EnableSandbox() {
//
// The seccomp sandbox is started in the renderer.
// http://code.google.com/p/seccompsandbox/
-#if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
- !defined(__clang__)
- // N.b. SupportsSeccompSandbox() returns a cached result, as we already
- // called it earlier in the zygote. Thus, it is OK for us to not pass in
- // a file descriptor for "/proc".
- if (switches::SeccompSandboxEnabled() && SupportsSeccompSandbox(-1))
- StartSeccompSandbox();
-#endif
+ // seccomp is currently disabled for nacl.
+ // http://code.google.com/p/chromium/issues/detail?id=59423
+ // See the code in chrome/renderer/renderer_main_platform_delegate_linux.cc
+ // for how to turn seccomp on.
+ //
+ // The seccomp sandbox should not be enabled for Native Client until
+ // all of these issues are fixed:
+ // http://code.google.com/p/nativeclient/issues/list?q=label:Seccomp
+ // At best, NaCl will not work. At worst, enabling the seccomp sandbox
+ // could create a hole in the NaCl sandbox.
}
bool NaClMainPlatformDelegate::RunSandboxTests() {