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

Commit 36ce96f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "rpc_binder: Properly shut down on socketpair() EOF" am: 35c03dfd am: 52fac114 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2362492



Change-Id: I3039dcfb0d9c06ab1ad6347737f5ddf9d7689a6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a232f1b5 52fac114

libs/binder/RpcServer.cpp

+10 −3
Original line number Diff line number Diff line
@@ -204,11 +204,15 @@ status_t RpcServer::recvmsgSocketConnection(const RpcServer& server, RpcTranspor 
    iovec iov{&zero, sizeof(zero)};

    std::vector<std::variant<base::unique_fd, base::borrowed_fd>> fds;



    if (receiveMessageFromSocket(server.mServer, &iov, 1, &fds) < 0) {

    ssize_t num_bytes = receiveMessageFromSocket(server.mServer, &iov, 1, &fds);

    if (num_bytes < 0) {

        int savedErrno = errno;

        ALOGE("Failed recvmsg: %s", strerror(savedErrno));

        return -savedErrno;

    }

    if (num_bytes == 0) {

        return DEAD_OBJECT;

    }

    if (fds.size() != 1) {

        ALOGE("Expected exactly one fd from recvmsg, got %zu", fds.size());

        return -EINVAL;
@@ -243,7 +247,10 @@ void RpcServer::join() { 
        socklen_t addrLen = addr.size();



        RpcTransportFd clientSocket;

        if (mAcceptFn(*this, &clientSocket) != OK) {

        if ((status = mAcceptFn(*this, &clientSocket)) != OK) {

            if (status == DEAD_OBJECT)

                break;

            else

                continue;

        }