diff options
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_util_Process.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 37bada45e1fc..5272af553fd2 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -719,7 +719,7 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o return; } - int fd = open("/proc/meminfo", O_RDONLY); + int fd = open("/proc/meminfo", O_RDONLY | O_CLOEXEC); if (fd < 0) { ALOGW("Unable to open /proc/meminfo: %s\n", strerror(errno)); diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 44f15cd637ed..550c44d0807c 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -218,7 +218,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin strcpy(cmdline, "unknown"); sprintf(proc_path, "/proc/%d/cmdline", pid); - fd = open(proc_path, O_RDONLY); + fd = open(proc_path, O_RDONLY | O_CLOEXEC); if (fd >= 0) { int rc = read(fd, cmdline, sizeof(cmdline)-1); cmdline[rc] = 0; @@ -554,7 +554,7 @@ jboolean android_os_Process_setSwappiness(JNIEnv *env, jobject clazz, return false; } - int fd = open(text, O_WRONLY); + int fd = open(text, O_WRONLY | O_CLOEXEC); if (fd >= 0) { sprintf(text, "%" PRId32, pid); write(fd, text, strlen(text)); @@ -602,7 +602,7 @@ static int pid_compare(const void* v1, const void* v2) static jlong getFreeMemoryImpl(const char* const sums[], const size_t sumsLen[], size_t num) { - int fd = open("/proc/meminfo", O_RDONLY); + int fd = open("/proc/meminfo", O_RDONLY | O_CLOEXEC); if (fd < 0) { ALOGW("Unable to open /proc/meminfo"); @@ -715,7 +715,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt sizesArray[i] = 0; } - int fd = open(file.string(), O_RDONLY); + int fd = open(file.string(), O_RDONLY | O_CLOEXEC); if (fd >= 0) { const size_t BUFFER_SIZE = 2048; @@ -1022,7 +1022,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, jniThrowException(env, "java/lang/OutOfMemoryError", NULL); return JNI_FALSE; } - int fd = open(file8, O_RDONLY); + int fd = open(file8, O_RDONLY | O_CLOEXEC); if (fd < 0) { if (kDebugProc) { @@ -1162,7 +1162,7 @@ jintArray android_os_Process_getPidsForCommands(JNIEnv* env, jobject clazz, char data[PATH_MAX]; snprintf(path, sizeof(path), "/proc/%d/cmdline", pid); - int fd = open(path, O_RDONLY); + int fd = open(path, O_RDONLY | O_CLOEXEC); if (fd < 0) { continue; } |