Merge pull request #29623 from YHNdnzj/core-followup

Follow-ups for recent changes to core/

src/basic/cgroup-util.c

@@ -314,19 +314,17 @@ static int cg_kill_items(
                 done = true;
 
                 r = cg_enumerate_items(SYSTEMD_CGROUP_CONTROLLER, path, &f, item);
-                if (r < 0) {
-                        if (ret >= 0 && r != -ENOENT)
-                                return r;
-
-                        return ret;
-                }
+                if (r == -ENOENT)
+                        break;
+                if (r < 0)
+                        return RET_GATHER(ret, r);
 
                 for (;;) {
                         _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
 
                         r = cg_read_pidref(f, &pidref);
                         if (r < 0)
-                                return r;
+                                return RET_GATHER(ret, r);
                         if (r == 0)
                                 break;
 
@@ -341,10 +339,9 @@ static int cg_kill_items(
 
                         /* If we haven't killed this process yet, kill it */
                         r = pidref_kill(&pidref, sig);
-                        if (r < 0) {
-                                if (ret >= 0 && r != -ESRCH)
-                                        ret = r;
-                        } else {
+                        if (r < 0 && r != -ESRCH)
+                                RET_GATHER(ret, r);
+                        if (r >= 0) {
                                 if (flags & CGROUP_SIGCONT)
                                         (void) pidref_kill(&pidref, SIGCONT);
 
@@ -359,17 +356,12 @@ static int cg_kill_items(
                         done = false;
 
                         r = set_put(s, PID_TO_PTR(pidref.pid));
-                        if (r < 0) {
-                                if (ret >= 0)
-                                        return r;
-
-                                return ret;
-                        }
+                        if (r < 0)
+                                return RET_GATHER(ret, r);
                 }
 
-                /* To avoid racing against processes which fork
-                 * quicker than we can kill them we repeat this until
-                 * no new pids need to be killed. */
+                /* To avoid racing against processes which fork quicker than we can kill them, we repeat this
+                 * until no new pids need to be killed. */
 
         } while (!done);
 

src/core/exec-invoke.c

@@ -4524,7 +4524,7 @@ int exec_invoke(
 
                 ngids_after_pam = getgroups_alloc(&gids_after_pam);
                 if (ngids_after_pam < 0) {
-                        *exit_status = EXIT_MEMORY;
+                        *exit_status = EXIT_GROUP;
                         return log_exec_error_errno(context, params, ngids_after_pam, "Failed to obtain groups after setting up PAM: %m");
                 }
         }
@@ -4632,7 +4632,7 @@ int exec_invoke(
                                                    ngids_after_pam,
                                                    &gids_to_enforce);
                 if (ngids_to_enforce < 0) {
-                        *exit_status = EXIT_MEMORY;
+                        *exit_status = EXIT_GROUP;
                         return log_exec_error_errno(context, params,
                                                     ngids_to_enforce,
                                                     "Failed to merge group lists. Group membership might be incorrect: %m");

src/core/namespace.c

@@ -2524,12 +2524,10 @@ int setup_namespace(const NamespaceParameters *p, char **error_path) {
         if (mount(NULL, "/", NULL, mount_propagation_flag | MS_REC, NULL) < 0)
                 return log_debug_errno(errno, "Failed to remount '/' with desired mount flags: %m");
 
-        /* bind_mount_in_namespace() will MS_MOVE into that directory, and that's only
-         * supported for non-shared mounts. This needs to happen after remounting / or it will fail. */
-        if (setup_propagate) {
-                if (mount(NULL, p->incoming_dir, NULL, MS_SLAVE, NULL) < 0)
-                        return log_debug_errno(errno, "Failed to remount %s with MS_SLAVE: %m", p->incoming_dir);
-        }
+        /* bind_mount_in_namespace() will MS_MOVE into that directory, and that's only supported for
+         * non-shared mounts. This needs to happen after remounting / or it will fail. */
+        if (setup_propagate && mount(NULL, p->incoming_dir, NULL, MS_SLAVE, NULL) < 0)
+                return log_debug_errno(errno, "Failed to remount %s with MS_SLAVE: %m", p->incoming_dir);
 
         return 0;
 }

src/core/service.c

@@ -1074,10 +1074,10 @@ static int service_is_suitable_main_pid(Service *s, PidRef *pid, int prio) {
                 return log_unit_full_errno(UNIT(s), prio, SYNTHETIC_ERRNO(EPERM), "New main PID "PID_FMT" is the control process, refusing.", pid->pid);
 
         r = pidref_is_alive(pid);
+        if (r < 0)
+                return log_unit_full_errno(UNIT(s), prio, r, "Failed to check if main PID "PID_FMT" exists or is a zombie: %m", pid->pid);
         if (r == 0)
                 return log_unit_full_errno(UNIT(s), prio, SYNTHETIC_ERRNO(ESRCH), "New main PID "PID_FMT" does not exist or is a zombie.", pid->pid);
-        if (r < 0)
-                return log_unit_full_errno(UNIT(s), prio, r, "Failed to check if main PID "PID_FMT" exists or is a zombie.", pid->pid);
 
         owner = manager_get_unit_by_pidref(UNIT(s)->manager, pid);
         if (owner == UNIT(s)) {