ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libprocessgroup: fix uid/pid hierarchy for recovery mode

Browse source 
configure the cgroup v2 hierarchy for recovery mode, and create uid/pid
groups with attributes following the container cgroup directory.

Bug: 168907513
Test: verified correct pid migration in normal and recovery modes
Change-Id: Idc8b96b4db075383a6a2e523c241b0bc632c7030
This commit is contained in:
Marco Ballesio 2021-02-11 14:44:53 -08:00
parent a7148f82a1
commit 9e628a6b42
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libprocessgroup/processgroup.cpp
View file

@ -421,14 +421,27 @@ int killProcessGroupOnce(uid_t uid, int initialPid, int signal, int* max_process
static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgroup) { static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgroup) {
auto uid_path = ConvertUidToPath(cgroup.c_str(), uid); auto uid_path = ConvertUidToPath(cgroup.c_str(), uid);
if (!MkdirAndChown(uid_path, 0750, AID_SYSTEM, AID_SYSTEM)) { struct stat cgroup_stat;
mode_t cgroup_mode = 0750;
gid_t cgroup_uid = AID_SYSTEM;
uid_t cgroup_gid = AID_SYSTEM;
if (stat(cgroup.c_str(), &cgroup_stat) == 1) {
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, 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;
} }
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, 0750, AID_SYSTEM, AID_SYSTEM)) { 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;
} }

6
libprocessgroup/profiles/cgroups.recovery.json
View file

@ -1,2 +1,8 @@
{ {
"Cgroups2": {
"Path": "/sys/fs/cgroup",
"Mode": "0755",
"UID": "root",
"GID": "root"
}
} }