From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 10 Jul 2023 17:46:29 +0000 (+0800)
Subject: shared/async: don't use WEXITED for waitpid()
X-Git-Tag: v254-rc2~47^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=898f4da326051addf1ec17887e6b1737d0dab2ec;p=thirdparty%2Fsystemd.git

shared/async: don't use WEXITED for waitpid()

Follow-up for c26d7837bb08508c8d906d849dff8f1bc465063e

waitpid() doesn't support WEXITED and returns -1 (EINVAL),
which results in the intermediate close process not getting
reaped.

Fixes https://github.com/systemd/systemd/issues/26744#issuecomment-1628240782
---

diff --git a/src/shared/async.c b/src/shared/async.c
index 1cf1936d4b1..6af63d7a9cb 100644
--- a/src/shared/async.c
+++ b/src/shared/async.c
@@ -103,10 +103,9 @@ int asynchronous_close(int fd) {
                  *
                  * We usually prefer calling waitid(), but before kernel 4.7 it didn't support __WCLONE while
                  * waitpid() did. Hence let's use waitpid() here, it's good enough for our purposes here. */
-                for (;;) {
-                        if (waitpid(pid, NULL, WEXITED|__WCLONE) >= 0 || errno != EINTR)
+                for (;;)
+                        if (waitpid(pid, NULL, __WCLONE) >= 0 || errno != EINTR)
                                 break;
-                }
         }
 
         return -EBADF; /* return an invalidated fd */