diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-13 17:03:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-13 17:03:59 +0000 |
| commit | 97735895a286f82ce9d955e043f3d28810e9e268 (patch) | |
| tree | a920384bf543e958aa1b8e61048d20d6c0ccb239 | |
| parent | f2ff682b0753322bcd9df9782c1f85f89da14427 (diff) | |
| parent | 03dfa27d40d55fb019cad287e6609fb3a58f246b (diff) | |
| download | base-97735895a286f82ce9d955e043f3d28810e9e268.tar.gz | |
Merge "Treat process group creation failure due to a dead process as non-fatal" am: 03dfa27d40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467472
Change-Id: Ic98c584d01d8dbb28d5bb48214bb7e61217fcf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index f04e2457d51f..57a196fa3d0c 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -1805,10 +1805,15 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, if (!is_system_server && getuid() == 0) { const int rc = createProcessGroup(uid, getpid()); if (rc != 0) { - 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))); + if (rc == -ESRCH) { + // If process is dead, treat this as a non-fatal error + ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* 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))); + } } } |