Split secure command channel and untrusted application channel

src/trusted/nonnacl_util/sel_ldr_launcher_base.cc

 /*
  * Copyright (c) 2012 The Native Client 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 "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 
 namespace nacl {
 
 SelLdrLauncherBase::SelLdrLauncherBase()
   : channel_(kInvalidHandle),
     bootstrap_socket_(NULL),
+    secure_socket_addr_(NULL),
     socket_addr_(NULL) {
 }
 
 SelLdrLauncherBase::~SelLdrLauncherBase() {
   if (kInvalidHandle != channel_) {
     Close(channel_);
   }
 }
 
 bool SelLdrLauncherBase::RetrieveSockAddr() {
@@ skipping 11 matching lines @@
   iovec[0].length = NACL_ABI_IMC_USER_BYTES_MAX;
   header.iov = iovec;
   header.iov_length = NACL_ARRAY_SIZE(iovec);
   header.ndescv = descs;
   header.ndescv_length = NACL_ARRAY_SIZE(descs);
   header.flags = 0;
   // Receive the message.
   if (0 != bootstrap_socket_->RecvMsg(&header, 0, NULL)) {
     return false;
   }
-  // Check that there was exactly one descriptor passed.
-  if (1 != header.ndescv_length) {
+  // Check that there were exactly two descriptors passed.
+  if (2 != header.ndescv_length) {
     return false;
   }
-  socket_addr_.reset(descs[0]);
+  secure_socket_addr_.reset(descs[0]);
+  socket_addr_.reset(descs[1]);
 
   return true;
 }
 
 bool SelLdrLauncherBase::SetupCommand(NaClSrpcChannel* command) {
   // Get the bootstrap socket.
   CHECK(factory_ == NULL);
   factory_.reset(new DescWrapperFactory);
   CHECK(channel_ != kInvalidHandle);
   bootstrap_socket_.reset(factory_->MakeImcSock(channel_));
   if (bootstrap_socket_ == NULL) {
     NaClLog(4, ("SelLdrLauncher::SetupCommand: "
                 "getting bootstrap socket failed\n"));
     return false;
   }
   // bootstrap_socket_ now has ownership of channel_, so we get rid of
   // our "reference" to it.
   channel_ = kInvalidHandle;
   // Get the socket address from the descriptor.
   if (!RetrieveSockAddr()) {
     NaClLog(0, "SelLdrLauncher::SetupCommand: "
             "getting sel_ldr socket address failed\n");
     return false;
   }
-  // The first connection goes to the trusted command channel.
-  scoped_ptr<DescWrapper> command_desc(socket_addr_->Connect());
+  // Connect to the trusted command channel.
+  scoped_ptr<DescWrapper> command_desc(secure_socket_addr_->Connect());
   if (command_desc == NULL) {
     NaClLog(0, "SelLdrLauncher::SetupCommand: Connect failed\n");
     return false;
   }
   // Start the SRPC client to communicate with the trusted command channel.
   // SRPC client takes an additional reference to command_desc.
   if (!NaClSrpcClientCtor(command, command_desc->desc())) {
     NaClLog(0, "SelLdrLauncher::SetupCommand: "
             "NaClSrpcClientCtor failed\n");
     return false;
@@ skipping 68 matching lines @@
     NaClLog(4, "SelLdrLauncher::StartModuleAndSetupAppChannel: "
             "start_module failed: rpc_result=%d, start_result=%d (%s)\n",
             static_cast<int>(rpc_result), start_result,
             NaClErrorString(static_cast<NaClErrorCode>(start_result)));
     return false;
   }
   return true;
 }
 
 bool SelLdrLauncherBase::SetupAppChannel(NaClSrpcChannel* out_app_chan) {
-  // The second connection goes to the untrusted service itself.
+  // Connect to the untrusted service itself.
   scoped_ptr<DescWrapper> untrusted_desc(socket_addr_->Connect());
   if (untrusted_desc == NULL) {
     NaClLog(4, "SelLdrLauncher::StartModuleAndSetupAppChannel: "
             "Connect failed\n");
     return false;
   }
   // Start the SRPC client to communicate with the untrusted service
   // SRPC client takes an additional reference to untrusted_desc.
   if (!NaClSrpcClientCtor(out_app_chan, untrusted_desc->desc())) {
     NaClLog(4, "SelLdrLauncher::StartModuleAndSetupAppChannel: "
@@ skipping 43 matching lines @@
   if (NULL != bootstrap_socket_.get()) {
     nbytes = bootstrap_socket_->RecvMsg(&hdr, 0, NULL);
   }
   if (nbytes > 0) {
     return nacl::string(msg_buf, nbytes);
   }
   return "";
 }
 
 }  // namespace nacl