commit 9156ccdbb481a09becab4157a2eb5e7535f62cc0
author Treehugger Robot <treehugger-gerrit@google.com> Sun Jan 01 22:28:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jan 01 22:28:37 2017 +0000
tree 67f6b0538143bd786000dc8f2466024b667651cd
parent 9cc7ebe7d90c8da1340c8115023bd38451e58f7e
parent b0e5079b5dc37641741c3ea370376261aa06667f

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

core/jni/android_net_LocalSocketImpl.cpp

diff --git a/core/jni/android_net_LocalSocketImpl.cpp b/core/jni/android_net_LocalSocketImpl.cpp
index d6d4310..37b6df1 100644
--- a/core/jni/android_net_LocalSocketImpl.cpp
+++ b/core/jni/android_net_LocalSocketImpl.cpp
@@ -202,9 +202,7 @@
     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