commit dd0c53aaec0aae7f3267e8e4fe78ea8e8e52a833
author Robert Sesek <rsesek@google.com> Wed Jan 25 18:33:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 18:33:06 2017 +0000
tree 9e0b1f5c456eeba637d3393813f12ba7ee80ab3a
parent 9a617138cc3212e49a527ef3afc15ad221c325f3
parent 82fbde6ca123c68b117b043f3b91514d95c93cc0

Merge "Ensure property_set connection sockets are CLOEXEC." am: 1ef5ecaca2 am: 5d6e678b9d am: 31992ebcaf
am: 82fbde6ca1

Change-Id: Ie6d81482f7f1cb38e694fb1428d22143327f99c8

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;
     }