commit dec6bcd2907d6a6ebfdc09fc6782a982aa767dda
author Robert Sesek <rsesek@google.com> Wed Jan 25 18:18:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 18:18:38 2017 +0000
tree c7f9ec8f3ee1d6afd95e78fb3abaa1dd5eaa616c
parent f6c00942d4115622e0093f8344bf692607a229df
parent 33689d666b91d093ff537f8539cdbdcb596e7239

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

Change-Id: Ia46f838e676a4f78a01ac6e9d76af8c112dcc74e

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