am 54175579: am 02526d48: debuggerd: properly unblock signal handler.

* commit '54175579333b4b95606bbdb7840bcfbea5b854ee':
  debuggerd: properly unblock signal handler.
This commit is contained in:
David 'Digit' Turner 2011-01-21 10:57:06 -08:00 committed by Android Git Automerger
commit 69416dadc9
1 changed files with 13 additions and 1 deletions

View File

@ -642,7 +642,7 @@ static void handle_crashing_process(int fd)
goto done;
}
sprintf(buf,"/proc/%d/task/%d", cr.pid, tid);
snprintf(buf, sizeof buf, "/proc/%d/task/%d", cr.pid, tid);
if(stat(buf, &s)) {
LOG("tid %d does not exist in pid %d. ignoring debug request\n",
tid, cr.pid);
@ -652,7 +652,19 @@ static void handle_crashing_process(int fd)
XLOG("BOOM: pid=%d uid=%d gid=%d tid=%d\n", cr.pid, cr.uid, cr.gid, tid);
/* Note that at this point, the target thread's signal handler
* is blocked in a read() call. This gives us the time to PTRACE_ATTACH
* to it before it has a chance to really fault.
*
* After the attach, the thread is stopped, and we write to the file
* descriptor to ensure that it will run as soon as we call PTRACE_CONT
* below. See details in bionic/libc/linker/debugger.c, in function
* debugger_signal_handler().
*/
tid_attach_status = ptrace(PTRACE_ATTACH, tid, 0, 0);
TEMP_FAILURE_RETRY(write(fd, &tid, 1));
if(tid_attach_status < 0) {
LOG("ptrace attach failed: %s\n", strerror(errno));
goto done;