Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5f8a692 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Modify debuggerd to cope with the abort message. 

(cherry picked from commit 707b8bbe)

Bug: 8531731
Change-Id: I2785a07ef83e085f338d3094f9972de23117807c
parent b4d52a43

debuggerd/debuggerd.c

+10 −4
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ typedef struct { 
    debugger_action_t action;

    pid_t pid, tid;

    uid_t uid, gid;

    uintptr_t abort_msg_address;

} debugger_request_t;



static int
@@ -207,13 +208,16 @@ static int read_request(int fd, debugger_request_t* out_request) { 
    }



    debugger_msg_t msg;

    memset(&msg, 0, sizeof(msg));

    status = TEMP_FAILURE_RETRY(read(fd, &msg, sizeof(msg)));

    if (status < 0) {

        LOG("read failure? %s (pid=%d uid=%d)\n",

            strerror(errno), cr.pid, cr.uid);

        return -1;

    }

    if (status != sizeof(msg)) {

    if (status == sizeof(debugger_msg_t)) {

        XLOG("crash request of size %d abort_msg_address=%#08x\n", status, msg.abort_msg_address);

    } else {

        LOG("invalid crash request of size %d (from pid=%d uid=%d)\n",

            status, cr.pid, cr.uid);

        return -1;
@@ -224,6 +228,7 @@ static int read_request(int fd, debugger_request_t* out_request) { 
    out_request->pid = cr.pid;

    out_request->uid = cr.uid;

    out_request->gid = cr.gid;

    out_request->abort_msg_address = msg.abort_msg_address;



    if (msg.action == DEBUGGER_ACTION_CRASH) {

        /* Ensure that the tid reported by the crashing process is valid. */
@@ -267,6 +272,7 @@ static void handle_request(int fd) { 
    XLOG("handle_request(%d)\n", fd);



    debugger_request_t request;

    memset(&request, 0, sizeof(request));

    int status = read_request(fd, &request);

    if (!status) {

        XLOG("BOOM: pid=%d uid=%d gid=%d tid=%d\n",
@@ -310,7 +316,7 @@ static void handle_request(int fd) { 
                        if (request.action == DEBUGGER_ACTION_DUMP_TOMBSTONE) {

                            XLOG("stopped -- dumping to tombstone\n");

                            tombstone_path = engrave_tombstone(request.pid, request.tid,

                                    signal, true, true, &detach_failed,

                                    signal, request.abort_msg_address, true, true, &detach_failed,

                                    &total_sleep_time_usec);

                        } else if (request.action == DEBUGGER_ACTION_DUMP_BACKTRACE) {

                            XLOG("stopped -- dumping to fd\n");
@@ -348,8 +354,8 @@ static void handle_request(int fd) { 
                        /* don't dump sibling threads when attaching to GDB because it

                         * makes the process less reliable, apparently... */

                        tombstone_path = engrave_tombstone(request.pid, request.tid,

                                signal, !attach_gdb, false, &detach_failed,

                                &total_sleep_time_usec);

                                signal, request.abort_msg_address, !attach_gdb, false,

                                &detach_failed, &total_sleep_time_usec);

                        break;

                    }

debuggerd/tombstone.c

+42 −6
Original line number Diff line number Diff line
@@ -622,10 +622,45 @@ static void dump_logs(log_t* log, pid_t pid, bool tailOnly) 
    dump_log_file(log, pid, "/dev/log/main", tailOnly);

}



static void dump_abort_message(log_t* log, pid_t tid, uintptr_t address) {

  if (address == 0) {

    return;

  }



  address += sizeof(size_t); // Skip the buffer length.



  char msg[512];

  memset(msg, 0, sizeof(msg));

  char* p = &msg[0];

  while (p < &msg[sizeof(msg)]) {

    uint32_t data;

    if (!try_get_word_ptrace(tid, address, &data)) {

      break;

    }

    address += sizeof(uint32_t);



    if ((*p++ = (data >>  0) & 0xff) == 0) {

      break;

    }

    if ((*p++ = (data >>  8) & 0xff) == 0) {

      break;

    }

    if ((*p++ = (data >> 16) & 0xff) == 0) {

      break;

    }

    if ((*p++ = (data >> 24) & 0xff) == 0) {

      break;

    }

  }

  msg[sizeof(msg) - 1] = '\0';



  _LOG(log, false, "Abort message: '%s'\n", msg);

}



/*

 * Dumps all information about the specified pid to the tombstone.

 */

static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal,

static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t abort_msg_address,

                       bool dump_sibling_threads, int* total_sleep_time_usec)

{

    /* don't copy log messages to tombstone unless this is a dev device */
@@ -653,6 +688,7 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, 
    if (signal) {

        dump_fault_addr(log, tid, signal);

    }

    dump_abort_message(log, tid, abort_msg_address);



    ptrace_context_t* context = load_ptrace_context(tid);

    dump_thread(context, log, tid, true, total_sleep_time_usec);
@@ -769,7 +805,7 @@ static int activity_manager_connect() { 
    return amfd;

}



char* engrave_tombstone(pid_t pid, pid_t tid, int signal,

char* engrave_tombstone(pid_t pid, pid_t tid, int signal, uintptr_t abort_msg_address,

        bool dump_sibling_threads, bool quiet, bool* detach_failed,

        int* total_sleep_time_usec) {

    mkdir(TOMBSTONE_DIR, 0755);
@@ -791,7 +827,7 @@ char* engrave_tombstone(pid_t pid, pid_t tid, int signal, 
    log.tfd = fd;

    log.amfd = activity_manager_connect();

    log.quiet = quiet;

    *detach_failed = dump_crash(&log, pid, tid, signal, dump_sibling_threads,

    *detach_failed = dump_crash(&log, pid, tid, signal, abort_msg_address, dump_sibling_threads,

            total_sleep_time_usec);



    close(log.amfd);

debuggerd/tombstone.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


/* Creates a tombstone file and writes the crash dump to it.

 * Returns the path of the tombstone, which must be freed using free(). */

char* engrave_tombstone(pid_t pid, pid_t tid, int signal,

char* engrave_tombstone(pid_t pid, pid_t tid, int signal, uintptr_t abort_msg_address,

        bool dump_sibling_threads, bool quiet, bool* detach_failed, int* total_sleep_time_usec);



#endif // _DEBUGGERD_TOMBSTONE_H

include/cutils/debugger.h

+1 −1
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ typedef enum { 
    DEBUGGER_ACTION_DUMP_BACKTRACE,

} debugger_action_t;



/* message sent over the socket */

typedef struct {

    debugger_action_t action;

    pid_t tid;

    uintptr_t abort_msg_address;

} debugger_msg_t;



/* Dumps a process backtrace, registers, and stack to a tombstone file (requires root).