Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b37d7998 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[BugFix][HWASAN] stack-buffer-overflow" am: 16335690 am: 2002e0a7... 

Merge "[BugFix][HWASAN] stack-buffer-overflow" am: 16335690 am: 2002e0a7 am: fec2dabc am: 2fcedb6b

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

Change-Id: Ida5ca72b70944d5df3af1321f5932811fef535b8
parents d5c741f8 2fcedb6b

core/jni/android_util_Process.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -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);

            if (rc < 0) {

                ALOGE("read /proc/%d/cmdline (%s)", pid, strerror(errno));

            } else {

                cmdline[rc] = 0;

                cmdline[rc] = 0;

            }

            close(fd);

            close(fd);

        }

        }