Add a whitelist check for nacl-nonsfi mode

components/nacl/browser/nacl_process_host.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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/process_iterator.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "components/nacl/browser/nacl_browser.h"
+#include "components/nacl/browser/nacl_browser_delegate.h"
 #include "components/nacl/browser/nacl_host_message_filter.h"
 #include "components/nacl/common/nacl_cmd_line.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/plugin_service.h"
@@ skipping 383 matching lines @@
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   nacl_browser->EnsureAllResourcesAvailable();
   if (!nacl_browser->IsOk()) {
     SendErrorToRenderer("could not find all the resources needed"
                         " to launch the process");
     delete this;
     return;
   }
 
   if (uses_nonsfi_mode_) {
+    bool nonsfi_mode_enabled = false;
 #if defined(OS_LINUX)
-    const bool kNonSFIModeSupported = true;
-#else
-    const bool kNonSFIModeSupported = false;
+    nonsfi_mode_enabled = nonsfi_mode_enabled ||

[jln (very slow on Chromium), 2014/05/08 23:22:41]

This is fine, but if you don't mind havint different bools, I think it would
make this more readable for security:

#if... OS_LINUX
const bool non_sfi_mode_forced_by_command_line = cmd->..
# if defined(OS_CHROMEOS) && .. ARMEL)
const bool non_sfi_mode_allowed = ...->IsNonSfiModeAllowed);
#endif

nonsfi_mode_enabled = !non_sfi_mode_allowed &&
!non_sfi_mode_forced_by_command_line;

[jln (very slow on Chromium), 2014/05/08 23:44:57]

err, enabled, not disabled:

nonsfi_mode_enabled = non_sfi_mode_allowed ||
non_sfi_mode_forced_by_command_line;

[elijahtaylor1, 2014/05/09 00:33:28]

Done.

+        cmd->HasSwitch(switches::kEnableNaClNonSfiMode);
+# if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+    nonsfi_mode_enabled = nonsfi_mode_enabled ||
+        NaClBrowser::GetDelegate()->IsNonSfiModeAllowed(manifest_url_);
+# endif
 #endif
-    if (!kNonSFIModeSupported ||
-        !cmd->HasSwitch(switches::kEnableNaClNonSfiMode)) {
-      SendErrorToRenderer("NaCl non-SFI mode works only on Linux with"
-                          " --enable-nacl-nonsfi-mode specified");
+    if (!nonsfi_mode_enabled) {
+      SendErrorToRenderer("NaCl non-SFI mode is not available for this platform"
+                          " and NaCl module.");
       delete this;
       return;
     }
   }
 
   // Rather than creating a socket pair in the renderer, and passing
   // one side through the browser to sel_ldr, socket pairs are created
   // in the browser and then passed to the renderer and sel_ldr.
   //
   // This is mainly for the benefit of Windows, where sockets cannot
@@ skipping 640 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl