commit 04baf1510809842f9129f5ba805e87ed6fbe23fc
author Josh Gao <jmgao@google.com> Mon Feb 06 19:00:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 06 19:00:45 2017 +0000
tree 0cf3327d300afe13e441c7eae571282009305f50
parent 05475991c7b4d59a4618ab8d570804a32500aff8
parent 285296477569162aac78f5fdf195df98a6d138e0

debuggerd_handler: don't use clone(..., SIGCHLD, ...) am: b3ee52e4d0 am: 6e121639ca
am: fe5a4cc0f7

Change-Id: I417b2aa9e1e854bc711dc8dcf327bd9b72754bb0

debuggerd/handler/debuggerd_handler.cpp

diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp
index 73257b9..156534e 100644
--- a/debuggerd/handler/debuggerd_handler.cpp
+++ b/debuggerd/handler/debuggerd_handler.cpp
@@ -208,7 +208,7 @@
   }
 
   // Don't use fork(2) to avoid calling pthread_atfork handlers.
-  int forkpid = clone(nullptr, nullptr, SIGCHLD, nullptr);
+  int forkpid = clone(nullptr, nullptr, 0, nullptr);
   if (forkpid == -1) {
     __libc_format_log(ANDROID_LOG_FATAL, "libc", "failed to fork in debuggerd signal handler: %s",
                       strerror(errno));
@@ -248,10 +248,12 @@
     close(pipefds[0]);
 
     // Don't leave a zombie child.
-    siginfo_t child_siginfo;
-    if (TEMP_FAILURE_RETRY(waitid(P_PID, forkpid, &child_siginfo, WEXITED)) != 0) {
+    int status;
+    if (TEMP_FAILURE_RETRY(waitpid(forkpid, &status, __WCLONE)) == -1 && errno != ECHILD) {
       __libc_format_log(ANDROID_LOG_FATAL, "libc", "failed to wait for crash_dump helper: %s",
                         strerror(errno));
+    } else if (WIFSTOPPED(status) || WIFSIGNALED(status)) {
+      __libc_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper crashed or stopped");
       thread_info->crash_dump_started = false;
     }
   }