commit a307bdac0f014bf71278ca5dfbda5d5a762195f6
author Todd Frederick <tfred@google.com> Wed Mar 30 21:06:51 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 30 21:06:51 2022 +0000
tree 7dcda2bca75331dda11a43c374c36ff117710cd7
parent 2d1b47815b542d6611a328388bf0eb786c9d23c7
parent 620d660d85c5093521473294d41aca7a1b21f89a

Merge "dumpstate: Close API FDs on exec" am: b8ba6e9cc0 am: bab1e600e3 am: ecc2f9e46e am: 620d660d85

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2043435

Change-Id: I19667dc826de76bf43d444d520de60ee184a4e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 24b201f..890c15f 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2733,8 +2733,8 @@
                                         const android::base::unique_fd& screenshot_fd_in,
                                         bool is_screenshot_requested) {
     // Duplicate the fds because the passed in fds don't outlive the binder transaction.
-    bugreport_fd.reset(dup(bugreport_fd_in.get()));
-    screenshot_fd.reset(dup(screenshot_fd_in.get()));
+    bugreport_fd.reset(fcntl(bugreport_fd_in.get(), F_DUPFD_CLOEXEC, 0));
+    screenshot_fd.reset(fcntl(screenshot_fd_in.get(), F_DUPFD_CLOEXEC, 0));
 
     SetOptionsFromMode(bugreport_mode, this, is_screenshot_requested);
 }