commit ecef005ae609ada3d882e706e20cdec5ff8e0d4f
author Suren Baghdasaryan <surenb@google.com> Thu Sep 07 15:11:05 2023 +0000
committer Suren Baghdasaryan <surenb@google.com> Mon Sep 11 17:22:18 2023 +0000
tree ee2aec5d761b7e1d358951cdd283e5931fab0250
parent fe3deb07dcddef7fa0c1ea85fdb6709906260862

Revert "Treat process group creation failure due to a dead process as non-fatal"

This reverts commit 26cc4077eaa89e76b14bddfc6007aa67285befac.

Reason for revert: This change is not needed in the presence of aosp/2521297, which was the right fix for the problem. This change only introduces another problem (see b/297649601).

Bug: 297649601
Change-Id: If1656c7393790327396a80431c9bb7cc4738988a
Signed-off-by: Suren Baghdasaryan <surenb@google.com>

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index bbaea0a..418000f 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1806,15 +1806,10 @@
     if (!is_system_server && getuid() == 0) {
         const int rc = createProcessGroup(uid, getpid());
         if (rc != 0) {
-            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)));
-            }
+            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)));
         }
     }