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

Merge "more O_CLOEXEC" am: 350f48328b

Browse Source 
am: 51aec2267c

Change-Id: I36d95d214a9b07c474b8a8c5fdb6dbf15c4cf535
This commit is contained in:
Nick Kralevich
2019-01-25 18:02:23 -08:00
committed by android-build-merger
parent 8da21b7b21 51aec2267c
commit 8d26cdbd34
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/fd_utils.cpp
View File

@@ -418,13 +418,13 @@ bool FileDescriptorInfo::GetSocketName(const int fd, std::string* result) {
}
void FileDescriptorInfo::DetachSocket(fail_fn_t fail_fn) const {
const int dev_null_fd = open("/dev/null", O_RDWR);
const int dev_null_fd = open("/dev/null", O_RDWR | O_CLOEXEC);
if (dev_null_fd < 0) {
fail_fn(std::string("Failed to open /dev/null: ").append(strerror(errno)));
}
if (dup2(dev_null_fd, fd) == -1) {
fail_fn(android::base::StringPrintf("Failed dup2 on socket descriptor %d: %s",
if (dup3(dev_null_fd, fd, O_CLOEXEC) == -1) {
fail_fn(android::base::StringPrintf("Failed dup3 on socket descriptor %d: %s",
fd,
strerror(errno)));
}