commit 777523e22a99fa05ef979aac03cfada065d9b4b0
author Nick Kralevich <nnk@google.com> Fri Jul 18 20:57:35 2014 -0700
committer Nick Kralevich <nnk@google.com> Fri Jul 18 20:57:35 2014 -0700
tree 0a2a1b60542512f3223cf965a1366b4776a4d13f
parent 29721dad54513b1fc971c70f824b0b6ccc83563f

adb: set O_CLOEXEC on lots of file descriptors

Too many leaking FDs.

Fixes bug: https://code.google.com/p/android/issues/detail?id=65857
(and more)

Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e

adb_auth_client.c

diff --git a/adb_auth_client.c b/adb_auth_client.c
index f8d7306..8409c63 100644
--- a/adb_auth_client.c
+++ b/adb_auth_client.c
@@ -57,7 +57,7 @@
     char *sep;
     int ret;
 
-    f = fopen(file, "r");
+    f = fopen(file, "re");
     if (!f) {
         D("Can't open '%s'\n", file);
         return;
@@ -126,7 +126,7 @@
     FILE *f;
     int ret;
 
-    f = fopen("/dev/urandom", "r");
+    f = fopen("/dev/urandom", "re");
     if (!f)
         return 0;
 
@@ -257,6 +257,7 @@
         D("Failed to get adbd socket\n");
         return;
     }
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 
     ret = listen(fd, 4);
     if (ret < 0) {