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

2017-01-01 22:28:36 +00:00
parent 9cc7ebe7d9 b0e5079b5d
commit 9156ccdbb4
1 changed files with 1 additions and 3 deletions
--- a/core/jni/android_net_LocalSocketImpl.cpp
+++ b/core/jni/android_net_LocalSocketImpl.cpp
@@ -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