commit 43f94fb8ba9b954a74db3fdaec4c92348ea7a779
author Nick Kralevich <nnk@google.com> Fri Jul 18 20:57:35 2014 -0700
committer Nick Kralevich <nnk@google.com> Mon Jul 21 19:34:31 2014 -0700
tree 9a1f44e4cceb5493a06354cd6a31cd6418d2439f
parent 1e569d0b02650e80b617dcaa7796b868f10a59c6

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)

(cherrypicked from commit 777523e22a99fa05ef979aac03cfada065d9b4b0)

Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e

remount_service.c

diff --git a/remount_service.c b/remount_service.c
index d3a649b..3a4535e 100644
--- a/remount_service.c
+++ b/remount_service.c
@@ -39,7 +39,7 @@
     const char delims[] = "\n";
     char buf[4096];
 
-    fd = unix_open("/proc/mounts", O_RDONLY);
+    fd = unix_open("/proc/mounts", O_RDONLY | O_CLOEXEC);
     if (fd < 0)
         return NULL;
 
@@ -83,7 +83,7 @@
     if (!dev)
         return -1;
 
-    fd = unix_open(dev, O_RDONLY);
+    fd = unix_open(dev, O_RDONLY | O_CLOEXEC);
     if (fd < 0)
         return -1;