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

usb_linux.c

diff --git a/usb_linux.c b/usb_linux.c
index 8ff753e..f16bdd0 100644
--- a/usb_linux.c
+++ b/usb_linux.c
@@ -170,7 +170,7 @@
             }
 
 //            DBGX("[ scanning %s ]\n", devname);
-            if((fd = unix_open(devname, O_RDONLY)) < 0) {
+            if((fd = unix_open(devname, O_RDONLY | O_CLOEXEC)) < 0) {
                 continue;
             }
 
@@ -597,10 +597,10 @@
     usb->mark = 1;
     usb->reaper_thread = 0;
 
-    usb->desc = unix_open(usb->fname, O_RDWR);
+    usb->desc = unix_open(usb->fname, O_RDWR | O_CLOEXEC);
     if(usb->desc < 0) {
         /* if we fail, see if have read-only access */
-        usb->desc = unix_open(usb->fname, O_RDONLY);
+        usb->desc = unix_open(usb->fname, O_RDONLY | O_CLOEXEC);
         if(usb->desc < 0) goto fail;
         usb->writeable = 0;
         D("[ usb open read-only %s fd = %d]\n", usb->fname, usb->desc);