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

Commit 4400fb5b authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" 

am: 9156ccdb

Change-Id: I1501dce93ba090237831bf4c777cea13870f393d
parents 5297dba7 9156ccdb

core/jni/android_net_LocalSocketImpl.cpp

+1 −3
Original line number Diff line number Diff line
@@ -202,9 +202,7 @@ static ssize_t socket_read_all(JNIEnv *env, jobject thisJ, int fd, 
    msg.msg_control = cmsgbuf;

    msg.msg_controllen = sizeof(cmsgbuf);



    do {

        ret = recvmsg(fd, &msg, MSG_NOSIGNAL);

    } while (ret < 0 && errno == EINTR);

    ret = TEMP_FAILURE_RETRY(recvmsg(fd, &msg, MSG_NOSIGNAL | MSG_CMSG_CLOEXEC));



    if (ret < 0 && errno == EPIPE) {

        // Treat this as an end of stream