Merge "Merge cherrypicks of ['android-review.googlesource.com/2520876'] into emu-32-release." into emu-32-releasesnap-temp-L89000000959684617snap-temp-L29900000959682055

1 files changed, 11 insertions, 0 deletions

diff --git a/android/android-emu-base/android/base/system/System.cpp b/android/android-emu-base/android/base/system/System.cpp
index 73bf1b9b28..123920636a 100755
--- a/android/android-emu-base/android/base/system/System.cpp
+++ b/android/android-emu-base/android/base/system/System.cpp
@@ -1723,6 +1723,17 @@ public:
             close(fd);
         }
 
+#ifndef _WIN32
+        // b/267354112
+        // need to close all the fds (other than stdio/... ) inherited from parent
+        if ((options & RunOptions::WaitForCompletion) == 0) {
+            int fdlimit = (int)sysconf(_SC_OPEN_MAX);
+            for (int i = STDERR_FILENO + 1; i < fdlimit; i++) {
+                close(i);
+            }
+        }
+#endif
+
         if (execvp(command, params.data()) == -1) {
             // emulator doesn't really like exit calls from a forked process
             // (it just hangs), so let's just kill it