Merge "[BugFix][HWASAN] stack-buffer-overflow" am: 16335690d4 am: 2002e0a739
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625862 Change-Id: I18ac634d813417fafebb38dcbdd804a12c68ef88
This commit is contained in:
@@ -261,8 +261,12 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
|
|||||||
sprintf(proc_path, "/proc/%d/cmdline", pid);
|
sprintf(proc_path, "/proc/%d/cmdline", pid);
|
||||||
fd = open(proc_path, O_RDONLY | O_CLOEXEC);
|
fd = open(proc_path, O_RDONLY | O_CLOEXEC);
|
||||||
if (fd >= 0) {
|
if (fd >= 0) {
|
||||||
int rc = read(fd, cmdline, sizeof(cmdline)-1);
|
ssize_t rc = read(fd, cmdline, sizeof(cmdline) - 1);
|
||||||
cmdline[rc] = 0;
|
if (rc < 0) {
|
||||||
|
ALOGE("read /proc/%d/cmdline (%s)", pid, strerror(errno));
|
||||||
|
} else {
|
||||||
|
cmdline[rc] = 0;
|
||||||
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user