commit 8eb7a6edeacfca93c79ea73c8348a782cf266ef6
author Bart Van Assche <bvanassche@google.com> Tue Mar 29 23:47:08 2022 +0000
committer Bart Van Assche <bvanassche@google.com> Wed Mar 30 01:40:50 2022 +0000
tree 8adb1b053ac2cb1a4c40b2b27ac52334c57f61a2
parent ec8519e953f494561dd1e24c51cba2d8556bca58

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

diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index e910680..54772b6 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -460,6 +460,7 @@
 
     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 @@
         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 @@
 
     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;
     }