NaCl repo side changes to make crash reporting more reliable.

src/trusted/nonnacl_util/posix/sel_ldr_launcher_posix.cc

 /*
  * 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.
  */
 
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ skipping 15 matching lines @@
 
 
 using std::vector;
 
 namespace nacl {
 
 SelLdrLauncher::~SelLdrLauncher() {
   CloseHandlesAfterLaunch();
   if (kInvalidHandle != child_process_) {
     int status;
+    // Ensure child process (service runtime) is kaput.  NB: we might
+    // close the command channel (or use the hard_shutdown RPC) rather
+    // than killing the process to allow the service runtime to do
+    // clean up, but the plugin should be responsible for that and we
+    // shouldn't introduce any timeout wait in a dtor.  Currently,
+    // ServiceRuntime::Shutdown kills the subprocess before closing
+    // the command channel, so we aren't providing the opportunity for
+    // a more graceful shutdown.
+    KillChildProcess();
     waitpid(child_process_, &status, 0);
   }
   if (kInvalidHandle != channel_) {
     Close(channel_);
   }
 }
 
 
 nacl::string SelLdrLauncher::GetSelLdrPathName() {
   char buffer[FILENAME_MAX];
@@ skipping 59 matching lines @@
       NaClLog(LOG_ERROR, "%s\n", argv[i]);
     }
     perror("execv");
     NaClExit(EXIT_FAILURE);
   }
   CloseHandlesAfterLaunch();
   return true;
 }
 
 bool SelLdrLauncher::KillChildProcess() {
+  if (kInvalidHandle == child_process_) {
+    // It is incorrect to use the kill syscall on kInvalidHandle as
+    // the pid, since using -1 as pid is defined by POSIX.1-2001 to
+    // send the signal (SIGKILL) to every process that the calling
+    // process may send signals to (except for init), which is
+    // Definitely Not What Was Intended for this.
+    return true;
+  }
   return 0 == kill(child_process_, SIGKILL);
   // We cannot set child_process_ to kInvalidHandle since we will want to wait
   // on its exit status.
 }
 
 }  // namespace nacl