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

Merge "more O_CLOEXEC"

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-20 14:44:26 +00:00
committed by Gerrit Code Review
parent fb7c0e8c91 422dd00fa3
commit 9f8ed6500a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_os_Debug.cpp
View File

@@ -717,7 +717,7 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o
return; return;
} }
int fd = open("/proc/meminfo", O_RDONLY); int fd = open("/proc/meminfo", O_RDONLY | O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
ALOGW("Unable to open /proc/meminfo: %s\n", strerror(errno)); ALOGW("Unable to open /proc/meminfo: %s\n", strerror(errno));

12
core/jni/android_util_Process.cpp
View File

@@ -218,7 +218,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
strcpy(cmdline, "unknown"); strcpy(cmdline, "unknown");
sprintf(proc_path, "/proc/%d/cmdline", pid); sprintf(proc_path, "/proc/%d/cmdline", pid);
fd = open(proc_path, O_RDONLY); fd = open(proc_path, O_RDONLY | O_CLOEXEC);
if (fd >= 0) { if (fd >= 0) {
int rc = read(fd, cmdline, sizeof(cmdline)-1); int rc = read(fd, cmdline, sizeof(cmdline)-1);
cmdline[rc] = 0; cmdline[rc] = 0;
@@ -553,7 +553,7 @@ jboolean android_os_Process_setSwappiness(JNIEnv *env, jobject clazz,
return false; return false;
} }
int fd = open(text, O_WRONLY); int fd = open(text, O_WRONLY | O_CLOEXEC);
if (fd >= 0) { if (fd >= 0) {
sprintf(text, "%" PRId32, pid); sprintf(text, "%" PRId32, pid);
write(fd, text, strlen(text)); write(fd, text, strlen(text));
@@ -601,7 +601,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) 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) { if (fd < 0) {
ALOGW("Unable to open /proc/meminfo"); ALOGW("Unable to open /proc/meminfo");
@@ -714,7 +714,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt
sizesArray[i] = 0; sizesArray[i] = 0;
} }
int fd = open(file.string(), O_RDONLY); int fd = open(file.string(), O_RDONLY | O_CLOEXEC);
if (fd >= 0) { if (fd >= 0) {
const size_t BUFFER_SIZE = 2048; const size_t BUFFER_SIZE = 2048;
@@ -1021,7 +1021,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
jniThrowException(env, "java/lang/OutOfMemoryError", NULL); jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
return JNI_FALSE; return JNI_FALSE;
} }
int fd = open(file8, O_RDONLY); int fd = open(file8, O_RDONLY | O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
if (kDebugProc) { if (kDebugProc) {
@@ -1161,7 +1161,7 @@ jintArray android_os_Process_getPidsForCommands(JNIEnv* env, jobject clazz,
char data[PATH_MAX]; char data[PATH_MAX];
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid); 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) { if (fd < 0) {
continue; continue;
} }