Merge "Revert "Fix the cgroup directory owner in createProcessGroupInternal()"" (7c43c6c9) · Commits · e / os / android_system_core

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