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

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

Merge "libprocessgroup: Add argument checks in KillProcessGroup()" am:... 

Merge "libprocessgroup: Add argument checks in KillProcessGroup()" am: 1d25c20a am: cca74678 am: a1a60eed

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2475609



Change-Id: Id336b422b81c4869413f7e82965689d604eeab2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d43bcc90 a1a60eed

libprocessgroup/processgroup.cpp

+8 −0
Original line number Diff line number Diff line
@@ -451,6 +451,14 @@ static int DoKillProcessGroupOnce(const char* cgroup, uid_t uid, int initialPid, 


static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries,

                            int* max_processes) {

    if (uid < 0) {

        LOG(ERROR) << __func__ << ": invalid UID " << uid;

        return -1;

    }

    if (initialPid <= 0) {

        LOG(ERROR) << __func__ << ": invalid PID " << initialPid;

        return -1;

    }

    std::string hierarchy_root_path;

    if (CgroupsAvailable()) {

        CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &hierarchy_root_path);