commit 3df27b6e65ee15ed18a7d17a82103fe59684be21
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 20 18:35:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 20 18:35:38 2016 +0000
tree 06bb517f353927a3971b81d803949bb1c5b00f4f
parent 52d7d3e0f105f9e08102580302b186f879dda3be
parent af02b554fc89ae0dad78dbe1bd6170c6e03e81a1

Merge "SockDiag.cpp: Add O_CLOEXEC to tcpdiag sockets"

server/FwmarkServer.cpp

diff --git a/server/FwmarkServer.cpp b/server/FwmarkServer.cpp
index 0fabfc4..000ffef 100644
--- a/server/FwmarkServer.cpp
+++ b/server/FwmarkServer.cpp
@@ -73,7 +73,7 @@
     message.msg_control = cmsgu.cmsg;
     message.msg_controllen = sizeof(cmsgu.cmsg);
 
-    int messageLength = TEMP_FAILURE_RETRY(recvmsg(client->getSocket(), &message, 0));
+    int messageLength = TEMP_FAILURE_RETRY(recvmsg(client->getSocket(), &message, MSG_CMSG_CLOEXEC));
     if (messageLength <= 0) {
         return -errno;
     }