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/SockDiag.cpp

diff --git a/server/SockDiag.cpp b/server/SockDiag.cpp
index d5150e2..c6a0a92 100644
--- a/server/SockDiag.cpp
+++ b/server/SockDiag.cpp
@@ -73,8 +73,8 @@
         return false;
     }
 
-    mSock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_INET_DIAG);
-    mWriteSock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_INET_DIAG);
+    mSock = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, NETLINK_INET_DIAG);
+    mWriteSock = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, NETLINK_INET_DIAG);
     if (!hasSocks()) {
         closeSocks();
         return false;