Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fd_utils: carry over O_CLOEXEC on duplicated FDs" am: a4d036e98b

Browse Source 
am: ac9d96a03c

Change-Id: I3b5b7c38522140f928a0f779ca60a8c93ed6cf4d
This commit is contained in:
Nick Kralevich
2018-12-17 00:19:37 -08:00
committed by android-build-merger
parent d090104b51 ac9d96a03c
commit bb67b501f9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/fd_utils.cpp
View File

@@ -327,11 +327,13 @@ bool FileDescriptorInfo::ReopenOrDetach(std::string* error_msg) const {
return false;
}
if (TEMP_FAILURE_RETRY(dup2(new_fd, fd)) == -1) {
int dupFlags = (fd_flags & FD_CLOEXEC) ? O_CLOEXEC : 0;
if (TEMP_FAILURE_RETRY(dup3(new_fd, fd, dupFlags)) == -1) {
close(new_fd);
*error_msg = android::base::StringPrintf("Failed dup2(%d, %d) (%s): %s",
*error_msg = android::base::StringPrintf("Failed dup3(%d, %d, %d) (%s): %s",
fd,
new_fd,
dupFlags,
file_path.c_str(),
strerror(errno));
return false;