From 8eb7a6edeacfca93c79ea73c8348a782cf266ef6 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 29 Mar 2022 23:47:08 +0000 Subject: [PATCH] Revert "Fix the cgroup directory owner in createProcessGroupInternal()" This reverts commit 812d7698d8728bba08c5abc27d58413d17f776de. Reason for revert: this patch is suspected to have caused b/227337425. Bug: 227337425 Bug: 227331047 Change-Id: I4ae26ccf61ad7c63dacc85da878ba0920736951c --- libprocessgroup/processgroup.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp index e9106805e..54772b6f9 100644 --- a/libprocessgroup/processgroup.cpp +++ b/libprocessgroup/processgroup.cpp @@ -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; }