summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2019-01-28 10:34:43 -0800
committer Nick Kralevich <nnk@google.com> 2019-01-28 10:34:43 -0800
commit5ca3af3148b0d9d2861d8aa6380bfc19fefe90ae (patch)
treefaba837b007e61d8b6fdeb118cc03961b528d3b4
parent31f977a44344b8930143f16ab7f2fee4c5302d33 (diff)
com_android_internal_os_AtomicDirectory.cpp: add O_CLOEXEC
Ensure that file descriptors don't leak across an execve() boundary by adding O_CLOEXEC Test: compiles and boots Change-Id: I7bd4b5aa03adf0ac372575b5251226f8b5e231ff
-rw-r--r--core/jni/com_android_internal_os_AtomicDirectory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_os_AtomicDirectory.cpp b/core/jni/com_android_internal_os_AtomicDirectory.cpp
index 50b2288a614a..76b0fc167264 100644
--- a/core/jni/com_android_internal_os_AtomicDirectory.cpp
+++ b/core/jni/com_android_internal_os_AtomicDirectory.cpp
@@ -29,7 +29,7 @@ static jint com_android_internal_os_AtomicDirectory_getDirectoryFd(JNIEnv* env,
return -1;
}
int fd;
- if ((fd = TEMP_FAILURE_RETRY(open(path8.c_str(), O_DIRECTORY | O_RDONLY))) == -1) {
+ if ((fd = TEMP_FAILURE_RETRY(open(path8.c_str(), O_DIRECTORY | O_RDONLY | O_CLOEXEC))) == -1) {
ALOGE("Cannot open directory %s, error: %s\n", path8.c_str(), strerror(errno));
return -1;
}