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 382 matching lines @@
   // We'll make sure this actually finished in StartWithLaunchedProcess, below.
   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_) {

[Mark Seaborn, 2014/05/03 01:37:59]

Note that this code path was originally just meant to be a sanity check that
prevents the renderer from requesting a nonsfi child process when it shouldn't.

This code path doesn't control whether the trusted plugin (in the renderer)
selects "arm-nonsfi" from the manifest file.  That's controlled by
components/nacl/renderer/ppb_nacl_private_impl.cc currently.  You might need to
add an IPC to plumb the info through from renderer to browser -- Hidehiko
started doing that when he changed ppb_nacl_private_impl.cc (but didn't commit
it because it turned out not to be necessary).

Oh, I see you've seen ppb_nacl_private_impl.cc already...

[elijahtaylor1, 2014/05/06 05:56:15]

I'll address this in ppb_nacl_private_impl.cc

-#if defined(OS_LINUX)
+    const bool kNonSFIModeSwitchEnabled =

[Mark Seaborn, 2014/05/03 01:37:59]

Nit: I think the "k" naming style is only for values that are constant at
compile time.

[elijahtaylor1, 2014/05/06 05:56:15]

Done.

+        cmd->HasSwitch(switches::kEnableNaClNonSfiMode);
+#if defined(OS_CHROMEOS)

[Mark Seaborn, 2014/05/03 01:37:59]

We also need to make this ARM-only.

[elijahtaylor1, 2014/05/06 05:56:15]

Done.

     const bool kNonSFIModeSupported = true;
+#elif defined(OS_LINUX)
+    const bool kNonSFIModeSupported = kNonSFIModeSwitchEnabled;
 #else
     const bool kNonSFIModeSupported = false;
 #endif
-    if (!kNonSFIModeSupported ||
-        !cmd->HasSwitch(switches::kEnableNaClNonSfiMode)) {
-      SendErrorToRenderer("NaCl non-SFI mode works only on Linux with"
-                          " --enable-nacl-nonsfi-mode specified");
+    bool is_enabled = kNonSFIModeSwitchEnabled ||
+        NaClBrowser::GetDelegate()->IsNonSfiModeAllowed(manifest_url_);
+
+    if (!kNonSFIModeSupported || !is_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