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

Commit b0808485 authored by Andy McFadden's avatar Andy McFadden
Browse files

Show pid+uid in certain failures 

If somebody sends debuggerd bad data, it logs a complaint
but doesn't give any indication of the source.  Now we show
the pid and uid we get from SO_PEERCRED.

Bug 7704699

Change-Id: I2738eb972932cc868ad969b60e16dd0b623212a1
parent 26f447f5

debuggerd/debuggerd.c

+6 −4
Original line number Diff line number Diff line
@@ -202,18 +202,20 @@ static int read_request(int fd, debugger_request_t* out_request) { 
    pollfds[0].revents = 0;

    status = TEMP_FAILURE_RETRY(poll(pollfds, 1, 3000));

    if (status != 1) {

        LOG("timed out reading tid\n");

        LOG("timed out reading tid (from pid=%d uid=%d)\n", cr.pid, cr.uid);

        return -1;

    }



    debugger_msg_t msg;

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

    if (status < 0) {

        LOG("read failure? %s\n", strerror(errno));

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

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

        return -1;

    }

    if (status != sizeof(msg)) {

        LOG("invalid crash request of size %d\n", status);

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

            status, cr.pid, cr.uid);

        return -1;

    }
@@ -245,7 +247,7 @@ static int read_request(int fd, debugger_request_t* out_request) { 
            return -1;

        }

    } else {

        /* No one else is not allowed to dump arbitrary processes. */

        /* No one else is allowed to dump arbitrary processes. */

        return -1;

    }

    return 0;