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

Commit c6ddf363 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder: RPC avoid SIGPIPE 

This was just being ignored before in our tests, but we can use
MSG_NOSIGNAL to avoid this.

Fixes: 183141167
Test: binderRpcTest on host and device (including after removing
RpcState::terminate which was avoiding SIGPIPE in at least some
cases)

Change-Id: I7c84fc28ff21400f2546f88403a79fae8985c4b7
parent 8911d46b

libs/binder/RpcState.cpp

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ bool RpcState::rpcSend(const base::unique_fd& fd, const char* what, const void* 
        return false;

    }



    ssize_t sent = TEMP_FAILURE_RETRY(send(fd.get(), data, size, 0));

    ssize_t sent = TEMP_FAILURE_RETRY(send(fd.get(), data, size, MSG_NOSIGNAL));



    if (sent < 0 || sent != static_cast<ssize_t>(size)) {

        ALOGE("Failed to send %s (sent %zd of %zu bytes) on fd %d, error: %s", what, sent, size,
@@ -212,7 +212,7 @@ bool RpcState::rpcRec(const base::unique_fd& fd, const char* what, void* data, s 
        return false;

    }



    ssize_t recd = TEMP_FAILURE_RETRY(recv(fd.get(), data, size, MSG_WAITALL));

    ssize_t recd = TEMP_FAILURE_RETRY(recv(fd.get(), data, size, MSG_WAITALL | MSG_NOSIGNAL));



    if (recd < 0 || recd != static_cast<ssize_t>(size)) {

        terminate();

libs/binder/tests/binderRpcTest.cpp

+0 −3
Original line number Diff line number Diff line
@@ -765,9 +765,6 @@ TEST_P(BinderRpc, OnewayCallQueueing) { 
}



TEST_P(BinderRpc, Die) {

    // TODO(b/183141167): handle this in library

    signal(SIGPIPE, SIG_IGN);



    for (bool doDeathCleanup : {true, false}) {

        auto proc = createRpcTestSocketServerProcess(1);