Merge "[BugFix][HWASAN] stack-buffer-overflow" am: 16335690d4 am: 2002e0a739 am: fec2dabce1 am: 2fcedb6b78

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625862

Change-Id: Ida5ca72b70944d5df3af1321f5932811fef535b8
This commit is contained in:
Treehugger Robot
2021-08-27 19:10:48 +00:00
committed by Automerger Merge Worker

View File

@@ -261,8 +261,12 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
sprintf(proc_path, "/proc/%d/cmdline", pid);
fd = open(proc_path, O_RDONLY | O_CLOEXEC);
if (fd >= 0) {
int rc = read(fd, cmdline, sizeof(cmdline)-1);
cmdline[rc] = 0;
ssize_t rc = read(fd, cmdline, sizeof(cmdline) - 1);
if (rc < 0) {
ALOGE("read /proc/%d/cmdline (%s)", pid, strerror(errno));
} else {
cmdline[rc] = 0;
}
close(fd);
}