diff options
| author | Andreas Gampe <agampe@google.com> | 2018-10-16 20:22:37 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-10-19 13:06:33 -0700 |
| commit | dfcd82c09e8ce4562ed39e006d4b1c8163b4e25e (patch) | |
| tree | d9bfd3e043a95b3c8e302769cef23c13a89df3c5 /adbconnection/adbconnection.cc | |
| parent | 4f570a43146c1456071f2ffe6590ab96e723051a (diff) | |
| download | platform_art-dfcd82c09e8ce4562ed39e006d4b1c8163b4e25e.tar.gz platform_art-dfcd82c09e8ce4562ed39e006d4b1c8163b4e25e.tar.bz2 platform_art-dfcd82c09e8ce4562ed39e006d4b1c8163b4e25e.zip | |
ART: Fix android-cloexec warnings
Use the DupCloexec helper wherever possible. Add O_CLOEXEC to open
and fopen calls.
Bug: 32619234
Test: WITH_TIDY=1 mmma art
Change-Id: I0afb1beea53ab8f68ab85d1762aff999903060fe
Diffstat (limited to 'adbconnection/adbconnection.cc')
| -rw-r--r-- | adbconnection/adbconnection.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc index 205013335bb..ba25393f0d5 100644 --- a/adbconnection/adbconnection.cc +++ b/adbconnection/adbconnection.cc @@ -20,6 +20,7 @@ #include "android-base/endian.h" #include "android-base/stringprintf.h" +#include "base/file_utils.h" #include "base/logging.h" #include "base/macros.h" #include "base/mutex.h" @@ -428,11 +429,11 @@ void AdbConnectionState::SendAgentFds(bool require_handshake) { cmsg->cmsg_type = SCM_RIGHTS; // Duplicate the fds before sending them. - android::base::unique_fd read_fd(dup(adb_connection_socket_)); + android::base::unique_fd read_fd(art::DupCloexec(adb_connection_socket_)); CHECK_NE(read_fd.get(), -1) << "Failed to dup read_fd_: " << strerror(errno); - android::base::unique_fd write_fd(dup(adb_connection_socket_)); + android::base::unique_fd write_fd(art::DupCloexec(adb_connection_socket_)); CHECK_NE(write_fd.get(), -1) << "Failed to dup write_fd: " << strerror(errno); - android::base::unique_fd write_lock_fd(dup(adb_write_event_fd_)); + android::base::unique_fd write_lock_fd(art::DupCloexec(adb_write_event_fd_)); CHECK_NE(write_lock_fd.get(), -1) << "Failed to dup write_lock_fd: " << strerror(errno); dt_fd_forward::FdSet { |