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

am: 5d6e678b9d

Change-Id: I6421dc4b6c504e9f662addcf567ddc4188883e99
This commit is contained in:
Robert Sesek 2017-01-25 18:23:36 +00:00 committed by android-build-merger
commit 31992ebcaf

View file

@ -381,7 +381,7 @@ static void handle_property_set(SocketConnection& socket,
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;
}