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"
@@ skipping 74 matching lines @@
   // 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;
   }
   return true;
 }
 
+bool SelLdrLauncherBase::SetupUntrustedCommand(NaClSrpcChannel* command) {
+  NaClSrpcChannel secure_chan;
+  if (!SetupCommand(&secure_chan)) {
+    NaClLog(LOG_ERROR, "SelLdrLauncher::SetupCommand: "
+            "failed to setup trusted command channel\n");
+    return false;
+  }
+  NaClDesc* h;
+  NaClSrpcResultCodes rpc_result =
+      NaClSrpcInvokeBySignature(&secure_chan,
+                                "command_setup::h",
+                                &h);
+  if (NACL_SRPC_RESULT_OK != rpc_result) {
+    NaClLog(LOG_ERROR, "SelLdrLauncher::SetupCommand: "
+            "command setup failed\n");
+    return false;
+  }
+  // Make a nacl::DescWrapper* from the NaClDesc*
+  scoped_ptr<nacl::DescWrapper> conn_cap(WrapCleanup(h));
+  if (conn_cap == NULL) {
+    NaClLog(LOG_ERROR, "SelLdrLauncher::SetupCommand: "
+            "command conn desc wrap failed\n");
+    return false;
+  }
+  scoped_ptr<DescWrapper> command_desc(conn_cap->Connect());
+  if (command_desc == NULL) {
+    NaClLog(0, "SelLdrLauncher::SetupCommand: Connect failed\n");
+    return false;
+  }
+  // Start the SRPC client to communicate with the 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;
+  }
+  return true;
+}
+
 bool SelLdrLauncherBase::LoadModule(NaClSrpcChannel* command,
                                     DescWrapper* nexe) {
   // TODO(sehr): This argument to load_module is unused.  Remove it.
   static const char kLoadModulePlaceHolderString[] = "place holder";
 
   CHECK(nexe != NULL);
   // Load module over command channel.
   NaClSrpcResultCodes rpc_result =
       NaClSrpcInvokeBySignature(command,
                                 "load_module:hs:",
@@ skipping 118 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