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

Commit 20a63b93 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix the cgroup directory owner in... 

Merge "Revert "Fix the cgroup directory owner in createProcessGroupInternal()"" am: 7c43c6c9 am: 71b587a9

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



Change-Id: I18994b9b9ebc6d3210973c30193e96cf2174e44a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd92c351 71b587a9

libprocessgroup/processgroup.cpp

+4 −2
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgr 


    struct stat cgroup_stat;

    mode_t cgroup_mode = 0750;

    uid_t cgroup_uid = AID_SYSTEM;

    gid_t cgroup_gid = AID_SYSTEM;

    int ret = 0;
@@ -467,10 +468,11 @@ static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgr 
        PLOG(ERROR) << "Failed to get stats for " << cgroup;

    } else {

        cgroup_mode = cgroup_stat.st_mode;

        cgroup_uid = cgroup_stat.st_uid;

        cgroup_gid = cgroup_stat.st_gid;

    }



    if (!MkdirAndChown(uid_path, cgroup_mode, uid, cgroup_gid)) {

    if (!MkdirAndChown(uid_path, cgroup_mode, cgroup_uid, cgroup_gid)) {

        PLOG(ERROR) << "Failed to make and chown " << uid_path;

        return -errno;

    }
@@ -484,7 +486,7 @@ static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgr 


    auto uid_pid_path = ConvertUidPidToPath(cgroup.c_str(), uid, initialPid);



    if (!MkdirAndChown(uid_pid_path, cgroup_mode, uid, cgroup_gid)) {

    if (!MkdirAndChown(uid_pid_path, cgroup_mode, cgroup_uid, cgroup_gid)) {

        PLOG(ERROR) << "Failed to make and chown " << uid_pid_path;

        return -errno;

    }