commit 802dcaceef3afb61653699e365a78a6324d11c8b
author Robert Sesek <rsesek@google.com> Wed Jan 25 18:23:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 18:23:36 2017 +0000
tree 741c5feab7e693a66df1b78ca15cda42fc1f9175
parent f3d7891d561a33c7610c6166ec6c40a3f829b5ca
parent dec6bcd2907d6a6ebfdc09fc6782a982aa767dda

Merge "Ensure property_set connection sockets are CLOEXEC." am: 1ef5ecaca2
am: 5d6e678b9d

Change-Id: I6421dc4b6c504e9f662addcf567ddc4188883e99

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index b2f6411..d323425 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -381,7 +381,7 @@
 static void handle_property_set_fd() {
     static constexpr uint32_t kDefaultSocketTimeout = 2000; /* ms */
 
-    int s = accept(property_set_fd, nullptr, nullptr);
+    int s = accept4(property_set_fd, nullptr, nullptr, SOCK_CLOEXEC);
     if (s == -1) {
         return;
     }