Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat process group creation failure due to a dead process as non-fatal" am: 03dfa27d40 am: 97735895a2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467472

Change-Id: I31ad8df3a5ff416bc1e739dfb9d9d00ab636d691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-13 17:39:27 +00:00
committed by Automerger Merge Worker
parent 942bc62c4f 97735895a2
commit 087c3f9227
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -1805,10 +1805,15 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
if (!is_system_server && getuid() == 0) { if (!is_system_server && getuid() == 0) {
const int rc = createProcessGroup(uid, getpid()); const int rc = createProcessGroup(uid, getpid());
if (rc != 0) { if (rc != 0) {
fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing " if (rc == -ESRCH) {
"CONFIG_CGROUP_CPUACCT?") // If process is dead, treat this as a non-fatal error
: CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid, ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));
/* pid= */ 0, strerror(-rc))); } else {
fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
"CONFIG_CGROUP_CPUACCT?")
: CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
/* pid= */ 0, strerror(-rc)));
}
} }
} }