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

Commit 8eb7a6ed authored by Bart Van Assche's avatar Bart Van Assche
Browse files

Revert "Fix the cgroup directory owner in createProcessGroupInternal()" 

This reverts commit 812d7698.

Reason for revert: this patch is suspected to have caused b/227337425.

Bug: 227337425
Bug: 227331047
Change-Id: I4ae26ccf61ad7c63dacc85da878ba0920736951c
parent ec8519e9

libprocessgroup/processgroup.cpp

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




    struct stat cgroup_stat;

    struct stat cgroup_stat;

    mode_t cgroup_mode = 0750;

    mode_t cgroup_mode = 0750;

    uid_t cgroup_uid = AID_SYSTEM;

    gid_t cgroup_gid = AID_SYSTEM;

    gid_t cgroup_gid = AID_SYSTEM;

    int ret = 0;

    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;

        PLOG(ERROR) << "Failed to get stats for " << cgroup;

    } else {

    } else {

        cgroup_mode = cgroup_stat.st_mode;

        cgroup_mode = cgroup_stat.st_mode;

        cgroup_uid = cgroup_stat.st_uid;

        cgroup_gid = cgroup_stat.st_gid;

        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;

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

        return -errno;

        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);

    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;

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

        return -errno;

        return -errno;

    }

    }