Non-SFI NaCl: Batch-open resource files

components/nacl/loader/nonsfi/nonsfi_listener.cc

 // Copyright 2014 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/loader/nonsfi/nonsfi_listener.h"
 
 #include "base/command_line.h"
 #include "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/loader/nacl_trusted_listener.h"
 #include "components/nacl/loader/nonsfi/irt_random.h"
 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
+#include "ppapi/nacl_irt/irt_manifest.h"
 #include "ppapi/nacl_irt/plugin_startup.h"
 
 #if defined(OS_NACL_NONSFI)
 #include "native_client/src/public/nonsfi/irt_random.h"
 #else
 #include "components/nacl/loader/nonsfi/irt_random.h"
 #endif
 
 #if !defined(OS_LINUX) && !defined(OS_NACL_NONSFI)
 # error "non-SFI mode is supported only on linux."
@@ skipping 118 matching lines @@
   CHECK(params.debug_stub_server_bound_socket.fd == -1);
 
   CHECK(params.handles.empty());
   // We are only expecting non-SFI mode to be used with NaCl for now,
   // not PNaCl processes.
   CHECK(params.process_type == kNativeNaClProcessType);
 
   CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
   CHECK(params.nexe_file_path_metadata.empty());
 
+  std::map<std::string, int> key_fd_map;
+  for (size_t i = 0; i < params.resource_files.size(); ++i) {
+    key_fd_map.insert(std::make_pair(

[Mark Seaborn, 2015/02/12 03:57:33]

Can you add a check analogous to
  CHECK(params.nexe_file_path_metadata.empty());
above which ensures that the browser didn't accidentally leak the file's
pathname here?

[Yusuke Sato, 2015/02/13 23:01:17]

Done.

+        params.resource_files[i].file_key,
+        IPC::PlatformFileForTransitToPlatformFile(
+            params.resource_files[i].file)));
+  }
+  ppapi::RegisterPreopenedDescriptorsNonSfi(key_fd_map);
+
   MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file));
 }
 
 }  // namespace nonsfi
 }  // namespace nacl