summaryrefslogtreecommitdiffstats
path: root/chrome/common/sandbox_init_wrapper_mac.cc
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 21:11:16 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 21:11:16 +0000
commite5511265a24b1cdef66178b417e96259d62ce1b5 (patch)
tree33dc5093d3b902f269a7f21055134c45c19a62a2 /chrome/common/sandbox_init_wrapper_mac.cc
parentee55219bf9a3787ff77b69e3fa5fcbee7bf98376 (diff)
downloadchromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.zip
chromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.tar.gz
chromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.tar.bz2
Revert 43253 - 1. Create a new sandbox type which allows access to Unix sockets in the Mac
renderer sandbox to support running Native Client. 2. Put the Native Client sel_ldr (which contains the user's untrusted code) into a new Mac sandbox type. 3. Open /dev/random in SandboxWarmup(). 4. Remove the "nosandbox" flag when running Mac tests. See http://codereview.chromium.org/1234003/show which was reverted because of problems on Mac 10.6. This change is identical except for the ";NACL" lines in the *.sb files. I've removed the 10.6specific sandbox commands and used the generic commands that work on 10.5 and 10.6. I will work on adding the 10.6specific commands in a different change list. BUG=http://code.google.com/p/nativeclient/issues/detail?id=327 TEST=nacl_ui_tests still pass while running in the sandbox. Review URL: http://codereview.chromium.org/1525005 TBR=msneck@google.com Review URL: http://codereview.chromium.org/1572009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/sandbox_init_wrapper_mac.cc')
-rw-r--r--chrome/common/sandbox_init_wrapper_mac.cc19
1 files changed, 4 insertions, 15 deletions
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index 3ed61ed..898faed 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -20,17 +20,8 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
// Browser process isn't sandboxed.
return true;
} else if (process_type == switches::kRendererProcess) {
- // Renderer process sandbox. If --internal_nacl is present then use the
- // version of the renderer sandbox which allows Native Client to use Unix
- // sockets.
- // TODO(msneck): Remove the use of Unix sockets from Native Client and
- // then get rid of the SANDBOX_TYPE_NACL_PLUGIN enum.
- // See http://code.google.com/p/nativeclient/issues/detail?id=344
- if (command_line.HasSwitch(switches::kInternalNaCl)) {
- sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_PLUGIN;
- } else {
- sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;
- }
+ // Renderer process sandbox.
+ sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;
} else if (process_type == switches::kExtensionProcess) {
// Extension processes are just renderers [they use RenderMain()] with a
// different set of command line flags.
@@ -48,10 +39,8 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
} else if (process_type == switches::kWorkerProcess) {
// Worker process sandbox.
sandbox_process_type = sandbox::SANDBOX_TYPE_WORKER;
- } else if (process_type == switches::kNaClLoaderProcess) {
- // Native Client sel_ldr (user untrusted code) sandbox.
- sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_LOADER;
- } else if ((process_type == switches::kPluginProcess) ||
+ } else if ((process_type == switches::kNaClLoaderProcess) ||
+ (process_type == switches::kPluginProcess) ||
(process_type == switches::kProfileImportProcess) ||
(process_type == switches::kGpuProcess)) {
return true;