commit 17866357c5437d1b43b9f4b7411e48d9c9c38bec
author Elliott Hughes <enh@google.com> Sun Feb 28 15:54:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 28 15:54:44 2016 +0000
tree 509bac14167c911239c92ad5add7b3752bfacd87
parent 31adf6cd3846030f0d7397fa5f3cc285d8c79533
parent 0f67d5ffa41ecc73f52e81f18f2a10229cc33de5

Merge "Create logging sockets with SOCK_NONBLOCK..."

libc/bionic/libc_logging.cpp

diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index c6e1c20..6802944 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -459,13 +459,8 @@
   // found that all logd crashes thus far have had no problem stuffing
   // the UNIX domain socket and moving on so not critical *today*.
 
-  int log_fd = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0));
-  if (log_fd < 0) {
-    return -1;
-  }
-
-  if (fcntl(log_fd, F_SETFL, O_NONBLOCK) == -1) {
-    close(log_fd);
+  int log_fd = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
+  if (log_fd == -1) {
     return -1;
   }