Refactor params of NaClProcessMsg_Start.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 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/nacl_listener.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 277 matching lines @@
   int urandom_fd = dup(base::GetUrandomFD());
   if (urandom_fd < 0) {
     LOG(ERROR) << "Failed to dup() the urandom FD";
     return;
   }
   NaClChromeMainSetUrandomFd(urandom_fd);
 #endif
   struct NaClApp* nap = NULL;
   NaClChromeMainInit();
 
-  crash_info_shmem_.reset(new base::SharedMemory(params.crash_info_shmem_handle,
-                                                 false));
+  CHECK(base::SharedMemory::IsHandleValid(params.crash_info_shmem_handle));
+  crash_info_shmem_.reset(new base::SharedMemory(
+      params.crash_info_shmem_handle, false /* not readonly */));
   CHECK(crash_info_shmem_->Map(nacl::kNaClCrashInfoShmemSize));
   NaClSetFatalErrorCallback(&FatalLogHandler);
 
   nap = NaClAppCreate();
   if (nap == NULL) {
     LOG(ERROR) << "NaClAppCreate() failed";
     return;
   }
 
   IPC::ChannelHandle browser_handle;
@@ skipping 26 matching lines @@
       IPC::Channel::GenerateVerifiedChannelID("nacl"),
       io_thread_.message_loop_proxy().get(),
       &shutdown_event_);
   if (!Send(new NaClProcessHostMsg_PpapiChannelsCreated(
           browser_handle,
           ppapi_renderer_handle,
           trusted_listener_->TakeClientChannelHandle(),
           manifest_service_handle)))
     LOG(ERROR) << "Failed to send IPC channel handle to NaClProcessHost.";
 
-  std::vector<nacl::FileDescriptor> handles = params.handles;
   struct NaClChromeMainArgs* args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->number_of_cores = number_of_cores_;
   args->create_memory_object_func = CreateMemoryObject;
 # if defined(OS_MACOSX)

[Mark Seaborn, 2015/04/24 00:53:25]

You could move this outside "#if defined(OS_LINUX) || defined(OS_MACOSX)".  See
next comment...

[hidehiko, 2015/04/24 10:05:18]

Acknowledged.

-  CHECK(handles.size() >= 1);
-  g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
-  handles.pop_back();
+  CHECK(params.mac_shm_fd != IPC::InvalidPlatformFileForTransit());
+  g_shm_fd = IPC::PlatformFileForTransitToPlatformFile(params.mac_shm_fd);
+# else
+  CHECK(params.mac_shm_fd == IPC::InvalidPlatformFileForTransit());

[Mark Seaborn, 2015/04/24 00:53:25]

Note that you're doing this check on OS_LINUX but not OS_WINDOWS.  If you define
mac_shm_fd conditionally that problem goes away.

[hidehiko, 2015/04/24 10:05:18]

Now the field is guraded by OS_MACOSX #ifdef, so I reverted the condition to the
original.

 # endif
 #endif
 
   DCHECK(params.process_type != nacl::kUnknownNaClProcessType);
-  CHECK(handles.size() >= 1);
-  NaClHandle irt_handle = nacl::ToNativeHandle(handles[handles.size() - 1]);
-  handles.pop_back();
+  CHECK(params.irt_handle != IPC::InvalidPlatformFileForTransit());
+  NaClHandle irt_handle =
+      IPC::PlatformFileForTransitToPlatformFile(params.irt_handle);
 
 #if defined(OS_WIN)
   args->irt_fd = _open_osfhandle(reinterpret_cast<intptr_t>(irt_handle),
                                  _O_RDONLY | _O_BINARY);
   if (args->irt_fd < 0) {
     LOG(ERROR) << "_open_osfhandle() failed";
     return;
   }
 #else
   args->irt_fd = irt_handle;
 #endif
 
   if (params.validation_cache_enabled) {
     // SHA256 block size.
     CHECK_EQ(params.validation_cache_key.length(), (size_t) 64);
     // The cache structure is not freed and exists until the NaCl process exits.
     args->validation_cache = CreateValidationCache(
         new BrowserValidationDBProxy(this), params.validation_cache_key,
         params.version);
   }
 
-  CHECK(handles.size() == 1);
-  args->imc_bootstrap_handle = nacl::ToNativeHandle(handles[0]);
+  CHECK(params.imc_bootstrap_handle != IPC::InvalidPlatformFileForTransit());
+  args->imc_bootstrap_handle =
+      IPC::PlatformFileForTransitToPlatformFile(params.imc_bootstrap_handle);
   args->enable_debug_stub = params.enable_debug_stub;
 
   // Now configure parts that depend on process type.
   // Start with stricter settings.
   args->enable_exception_handling = 0;
   args->enable_dyncode_syscalls = 0;
   // pnacl_mode=1 mostly disables things (IRT interfaces and syscalls).
   args->pnacl_mode = 1;
   // Bound the initial nexe's code segment size under PNaCl to reduce the
   // chance of a code spraying attack succeeding (see
   // https://code.google.com/p/nativeclient/issues/detail?id=3572).
   // We can't apply this arbitrary limit outside of PNaCl because it might
   // break existing NaCl apps, and this limit is only useful if the dyncode
   // syscalls are disabled.
   args->initial_nexe_max_code_bytes = 64 << 20;  // 64 MB.
 
   if (params.process_type == nacl::kNativeNaClProcessType) {
     args->enable_exception_handling = 1;
     args->enable_dyncode_syscalls = 1;
     args->pnacl_mode = 0;
     args->initial_nexe_max_code_bytes = 0;
   } else if (params.process_type == nacl::kPNaClTranslatorProcessType) {
     // Transitioning the PNaCl translators to use the IRT again:
     // https://code.google.com/p/nativeclient/issues/detail?id=3914.
     // Once done, this can be removed.
     args->irt_load_optional = 1;
     args->pnacl_mode = 0;
   }
 
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-  args->debug_stub_server_bound_socket_fd = nacl::ToNativeHandle(
-      params.debug_stub_server_bound_socket);
+#if defined(OS_POSIX)
+  args->debug_stub_server_bound_socket_fd =
+      IPC::PlatformFileForTransitToPlatformFile(
+          params.debug_stub_server_bound_socket);
+#else
+  CHECK(params.debug_stub_server_bound_socket ==
+        IPC::InvalidPlatformFileForTransit());
 #endif
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
   args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
   args->debug_stub_server_port_selected_handler_func =
       DebugStubPortSelectedHandler;
 #endif
   args->load_status_handler_func = LoadStatusCallback;
 #if defined(OS_LINUX)
   args->prereserved_sandbox_size = prereserved_sandbox_size_;
@@ skipping 39 matching lines @@
 }
 
 void NaClListener::OnFileTokenResolved(
     uint64_t token_lo,
     uint64_t token_hi,
     IPC::PlatformFileForTransit ipc_fd,
     base::FilePath file_path) {
   resolved_cb_.Run(ipc_fd, file_path);
   resolved_cb_.Reset();
 }