diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2023-08-24 13:42:18 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-09-05 13:08:59 -0300 |
| commit | 0d6f9f626521678f330f8bfee89e1cdb7e2b1062 (patch) | |
| tree | 07f06fe07f28134c068aeeb53d1560603612a321 | |
| parent | ce2bfb856987526c2f27fb934b5eedd70d3472d7 (diff) | |
| download | glibc-0d6f9f626521678f330f8bfee89e1cdb7e2b1062.tar.xz glibc-0d6f9f626521678f330f8bfee89e1cdb7e2b1062.zip | |
posix: Add pidfd_spawn and pidfd_spawnp (BZ 30349)
Returning a pidfd allows a process to keep a race-free handle for a
child process, otherwise, the caller will need to either use pidfd_open
(which still might be subject to TOCTOU) or keep the old racy interface
base on pid_t.
To correct use pifd_spawn, the kernel must support not only returning
the pidfd with clone/clone3 but also waitid (P_PIDFD) (added on Linux
5.4). If kernel does not support the waitid, pidfd return ENOSYS.
It avoids the need to racy workarounds, such as reading the procfs
fdinfo to get the pid to use along with other wait interfaces.
These interfaces are similar to the posix_spawn and posix_spawnp, with
the only difference being it returns a process file descriptor (int)
instead of a process ID (pid_t). Their prototypes are:
int pidfd_spawn (int *restrict pidfd,
const char *restrict file,
const posix_spawn_file_actions_t *restrict facts,
const posix_spawnattr_t *restrict attrp,
char *const argv[restrict],
char *const envp[restrict])
int pidfd_spawnp (int *restrict pidfd,
const char *restrict path,
const posix_spawn_file_actions_t *restrict facts,
const posix_spawnattr_t *restrict attrp,
char *const argv[restrict_arr],
char *const envp[restrict_arr]);
A new symbol is used instead of a posix_spawn extension to avoid
possible issues with language bindings that might track the return
argument lifetime. Although on Linux pid_t and int are interchangeable,
POSIX only states that pid_t should be a signed integer.
Both symbols reuse the posix_spawn posix_spawn_file_actions_t and
posix_spawnattr_t, to void rehash posix_spawn API or add a new one. It
also means that both interfaces support the same attribute and file
actions, and a new flag or file action on posix_spawn is also added
automatically for pidfd_spawn.
Also, using posix_spawn plumbing allows the reusing of most of the
current testing with some changes:
- waitid is used instead of waitpid since it is a more generic
interface.
- tst-posix_spawn-setsid.c is adapted to take into consideration that
the caller can check for session id directly. The test now spawns
itself and writes the session id as a file instead.
- tst-spawn3.c need to know where pidfd_spawn is used so it keeps an
extra file description unused.
Checked on x86_64-linux-gnu on Linux 4.15 (no CLONE_PIDFD or waitid
support), Linux 5.4 (full support), and Linux 6.2.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
66 files changed, 788 insertions, 150 deletions
@@ -20,6 +20,13 @@ Major new features: to set the cgroupv2 in the new process in a race-free manner. These functions are GNU extensions and require a kernel with clone3 support. +* On Linux, the pidfd_spawn and pidfd_spawp functions have been added. + They have a similar prototype and semantic as posix_spawn, but instead of + returning a process ID, they return a file descriptor that can be used + along other pidfd functions (like pidfd_send_signal, poll, or waitid). + The pidfd functionality avoids the issue of PID reuse with the traditional + posix_spawn interface. + Deprecated and removed features, and other changes affecting compatibility: [Add deprecations, removals and changes affecting compatibility here] diff --git a/include/clone_internal.h b/include/clone_internal.h index ad7b170f58..567160ebb5 100644 --- a/include/clone_internal.h +++ b/include/clone_internal.h @@ -35,6 +35,10 @@ extern int __clone_internal_fallback (struct clone_args *__cl_args, void *__arg) attribute_hidden; +/* Return whether the kernel supports pid file descriptor, including clone + with CLONE_PIDFD and waitid with P_PIDFD. */ +extern bool __clone_pidfd_supported (void) attribute_hidden; + #ifndef _ISOMAC libc_hidden_proto (__clone3) libc_hidden_proto (__clone_internal) diff --git a/manual/process.texi b/manual/process.texi index c8413a5a58..68361c3f61 100644 --- a/manual/process.texi +++ b/manual/process.texi @@ -136,13 +136,13 @@ creating a process and making it run another program. @cindex parent process @cindex subprocess A new processes is created when one of the functions -@code{posix_spawn}, @code{fork}, @code{_Fork} or @code{vfork} is called. -(The @code{system} and @code{popen} also create new processes internally.) -Due to the name of the @code{fork} function, the act of creating a new -process is sometimes called @dfn{forking} a process. Each new process -(the @dfn{child process} or @dfn{subprocess}) is allocated a process -ID, distinct from the process ID of the parent process. @xref{Process -Identification}. +@code{posix_spawn}, @code{fork}, @code{_Fork}, @code{vfork}, or +@code{pidfd_spawn} is called. (The @code{system} and @code{popen} also +create new processes internally.) Due to the name of the @code{fork} +function, the act of creating a new process is sometimes called +@dfn{forking} a process. Each new process (the @dfn{child process} or +@dfn{subprocess}) is allocated a process ID, distinct from the process +ID of the parent process. @xref{Process Identification}. After forking a child process, both the parent and child processes continue to execute normally. If you want your program to wait for a diff --git a/posix/Makefile b/posix/Makefile index 70faad4b63..905cf9fb54 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -602,6 +602,7 @@ tst-spawn-static-ARGS = $(tst-spawn-ARGS) tst-spawn5-ARGS = -- $(host-test-program-cmd) tst-spawn6-ARGS = -- $(host-test-program-cmd) tst-spawn7-ARGS = -- $(host-test-program-cmd) +tst-posix_spawn-setsid-ARGS = -- $(host-test-program-cmd) tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir tst-chmod-ARGS = $(objdir) tst-vfork3-ARGS = --test-dir=$(objpfx) diff --git a/posix/spawn_int.h b/posix/spawn_int.h index aeb066c44f..64ee03e62d 100644 --- a/posix/spawn_int.h +++ b/posix/spawn_int.h @@ -76,12 +76,13 @@ struct __spawn_action #define SPAWN_XFLAGS_USE_PATH 0x1 #define SPAWN_XFLAGS_TRY_SHELL 0x2 +#define SPAWN_XFLAGS_RET_PIDFD 0x4 extern int __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t * file_actions) attribute_hidden; -extern int __spawni (pid_t *pid, const char *path, +extern int __spawni (int *pid, const char *path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *attrp, char *const argv[], char *const envp[], int xflags) attribute_hidden; diff --git a/posix/tst-posix_spawn-setsid.c b/posix/tst-posix_spawn-setsid.c index 124d878ce2..b47eb16cc5 100644 --- a/posix/tst-posix_spawn-setsid.c +++ b/posix/tst-posix_spawn-setsid.c @@ -18,78 +18,159 @@ #include <errno.h> #include <fcntl.h> +#include <getopt.h> +#include <intprops.h> +#include <paths.h> #include <spawn.h> #include <stdbool.h> #include <stdio.h> +#include <stdlib.h> #include <sys/resource.h> +#include <sys/wait.h> #include <unistd.h> #include <support/check.h> +#include <support/xunistd.h> +#include <support/temp_file.h> +#include <tst-spawn.h> +/* Nonzero if the program gets called via `exec'. */ +static int restart; + +/* Hold the four initial argument used to respawn th |
