NaCl repo side changes to make crash reporting more reliable.

src/trusted/service_runtime/sel_main.c

 /*
  * Copyright (c) 2011 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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 #include "native_client/src/include/portability.h"
@@ skipping 145 matching lines @@
 
   struct NaClApp                state;
   char                          *nacl_file = NULL;
   char                          *blob_library_file = NULL;
   int                           rpc_supplies_nexe = 0;
   int                           export_addr_to = -2;
 
   struct NaClApp                *nap;
 
   struct GioFile                gout;
-  NaClErrorCode                 errcode;
+  NaClErrorCode                 errcode = LOAD_INTERNAL;
   struct GioMemoryFileSnapshot  blob_file;
 
   int                           ret_code;
   struct DynArray               env_vars;
 
   char                          *log_file = NULL;
   struct GioFile                *log_gio;
   int                           log_desc;
   int                           verbosity = 0;
   int                           fuzzing_quit_after_load = 0;
@@ skipping 672 matching lines @@
   fflush(stdout);
 
   if (verbosity) {
     gprintf((struct Gio *) &gout, "exiting -- printing NaClApp details\n");
     NaClAppPrintDetails(nap, (struct Gio *) &gout);
 
     printf("Dumping vmmap.\n"); fflush(stdout);
     PrintVmmap(nap);
     fflush(stdout);
   }
+  /*
+   * If there is a secure command channel, we sent an RPC reply with
+   * the reason that the nexe was rejected.  If we exit now, that
+   * reply may still be in-flight and the various channel closure (esp
+   * reverse channel) may be detected first.  This would result in a
+   * crash being reported, rather than the error in the RPC reply.
+   * Instead, we wait for the hard-shutdown on the command channel.
+   */
+  if (LOAD_OK != errcode) {
+    NaClBlockIfCommandChannelExists(nap);
+  }
 
  done_file_dtor:
   if (verbosity > 0) {
     printf("Done.\n");
   }
   fflush(stdout);
 
   if (handle_signals) NaClSignalHandlerFini();
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 
   /* Unreachable, but having the return prevents a compiler error. */
   return ret_code;
 }