lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

posix: Add posix_spawn_file_actions_addclosefrom_np

Browse Source 
This patch adds a way to close a range of file descriptors on
posix_spawn as a new file action.  The API is similar to the one
provided by Solaris 11 [1], where the file action causes the all open
file descriptors greater than or equal to input on to be closed when
the new process is spawned.

The function posix_spawn_file_actions_addclosefrom_np is safe to be
implemented by iterating over /proc/self/fd, since the Linux spawni.c
helper process does not use CLONE_FILES, so its has own file descriptor
table and any failure (in /proc operation) aborts the process creation
and returns an error to the caller.

I am aware that this file action might be redundant to the current
approach of POSIX in promoting O_CLOEXEC in more interfaces. However
O_CLOEXEC is still not the default and for some specific usages, the
caller needs to close all possible file descriptors to avoid them
leaking.  Some examples are CPython (discussed in BZ#10353) and OpenJDK
jspawnhelper [2] (where OpenJDK spawns a helper process to exactly
closes all file descriptors).  Most likely any environment which calls
functions that might open file descriptor under the hood and aim to use
posix_spawn might face the same requirement.

Checked on x86_64-linux-gnu and i686-linux-gnu on kernel 5.11 and 4.15.

[1] https://docs.oracle.com/cd/E36784_01/html/E36874/posix-spawn-file-actions-addclosefrom-np-3c.html
[2] https://github.com/openjdk/jdk/blob/master/src/java.base/unix/native/libjava/childproc.c#L82
This commit is contained in:
Adhemerval Zanella
2021-03-10 12:26:33 -03:00
parent 607449506f
commit 882d6e17bc
49 changed files with 483 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysdeps/unix/sysv/linux/aarch64/libc.abilist
View File

@ -2453,6 +2453,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/alpha/libc.abilist
View File

@ -2552,6 +2552,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/arc/libc.abilist
View File

@ -2212,6 +2212,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/arm/be/libc.abilist
View File

@ -346,6 +346,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/arm/le/libc.abilist
View File

@ -343,6 +343,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

3
sysdeps/unix/sysv/linux/closefrom.c
View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <stdbool.h>
#include <stdio.h>
#include <sys/param.h>
#include <unistd.h>
@ -29,7 +30,7 @@ __closefrom (int lowfd)
if (r == 0)
return;
if (!__closefrom_fallback (l))
if (!__closefrom_fallback (l, true))
__fortify_fail ("closefrom failed to close a file descriptor");
}
weak_alias (__closefrom, closefrom)

8
sysdeps/unix/sysv/linux/closefrom_fallback.c
View File

@ -22,9 +22,11 @@
#include <stdbool.h>
/* Fallback code: iterates over /proc/self/fd, closing each file descriptor
that fall on the criteria. */
that fall on the criteria. If DIRFD_FALLBACK is set, a failure on
/proc/self/fd open will trigger a fallback that tries to close a file
descriptor before proceed. */
_Bool
__closefrom_fallback (int from)
__closefrom_fallback (int from, _Bool dirfd_fallback)
{
bool ret = false;
@ -33,7 +35,7 @@ __closefrom_fallback (int from)
if (dirfd == -1)
{
/* The closefrom should work even when process can't open new files. */
if (errno == ENOENT)
if (errno == ENOENT || !dirfd_fallback)
goto err;
for (int i = from; i < INT_MAX; i++)

1
sysdeps/unix/sysv/linux/csky/libc.abilist
View File

@ -2478,6 +2478,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/hppa/libc.abilist
View File

@ -2431,6 +2431,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/i386/libc.abilist
View File

@ -2615,6 +2615,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/ia64/libc.abilist
View File

@ -2390,6 +2390,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
View File

@ -347,6 +347,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
View File

@ -2558,6 +2558,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
View File

@ -2529,6 +2529,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
View File

@ -2526,6 +2526,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
View File

@ -2523,6 +2523,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
View File

@ -2521,6 +2521,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
View File

@ -2529,6 +2529,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
View File

@ -2441,6 +2441,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/nios2/libc.abilist
View File

@ -2568,6 +2568,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
View File

@ -2585,6 +2585,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
View File

@ -2618,6 +2618,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
View File

@ -2354,6 +2354,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
View File

@ -2649,6 +2649,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
View File

@ -2214,6 +2214,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
View File

@ -2414,6 +2414,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
View File

@ -2583,6 +2583,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
View File

@ -2391,6 +2391,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/sh/be/libc.abilist
View File

@ -2438,6 +2438,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/sh/le/libc.abilist
View File

@ -2435,6 +2435,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
View File

@ -2578,6 +2578,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
View File

@ -2413,6 +2413,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

25
sysdeps/unix/sysv/linux/spawn_int_def.h Normal file
View File

@ -0,0 +1,25 @@
/* Internal definitions for posix_spawn functionality. Linux version.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#ifndef _SPAWN_INT_DEF_H
#define _SPAWN_INT_DEF_H
/* spawni.c implements closefrom by interacting over /proc/self/fd. */
#define __SPAWN_SUPPORT_CLOSEFROM 1
#endif /* _SPAWN_INT_H */

36
sysdeps/unix/sysv/linux/spawni.c
View File

@ -16,22 +16,16 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <spawn.h>
#include <fcntl.h>
#include <paths.h>
#include <string.h>
#include <sys/resource.h>
#include <sys/wait.h>
#include <sys/param.h>
#include <sys/mman.h>
#include <not-cancel.h>
#include <local-setxid.h>
#include <shlib-compat.h>
#include <pthreadP.h>
#include <dl-sysdep.h>
#include <libc-pointer-arith.h>
#include <internal-signals.h>
#include <ldsodefs.h>
#include "spawn_int.h"
#include <local-setxid.h>
#include <not-cancel.h>
#include <paths.h>
#include <shlib-compat.h>
#include <spawn.h>
#include <spawn_int.h>
#include <sysdep.h>
#include <sys/resource.h>
/* The Linux implementation of posix_spawn{p} uses the clone syscall directly
with CLONE_VM and CLONE_VFORK flags and an allocated stack. The new stack
@ -280,6 +274,14 @@ __spawni_child (void *arguments)
if (__fchdir (action->action.fchdir_action.fd) != 0)
goto fail;
break;
case spawn_do_closefrom:
{
int lowfd = action->action.closefrom_action.from;
int r = INLINE_SYSCALL_CALL (close_range, lowfd, ~0U, 0);
if (r != 0 && !__closefrom_fallback (lowfd, false))
goto fail;
} break;
}
}
}
@ -344,7 +346,9 @@ __spawnix (pid_t * pid, const char *file,
/* We need at least a few pages in case the compiler's stack checking is
enabled. In some configs, it is known to use at least 24KiB. We use
32KiB to be "safe" from anything the compiler might do. Besides, the
extra pages won't actually be allocated unless they get used. */
extra pages won't actually be allocated unless they get used.
It also acts the slack for spawn_closefrom (including MIPS64 getdents64
where it might use about 1k extra stack space). */
argv_size += (32 * 1024);
size_t stack_size = ALIGN_UP (argv_size, GLRO(dl_pagesize));
void *stack = __mmap (NULL, stack_size, prot,

1
sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
View File

@ -2369,6 +2369,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F

1
sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
View File

@ -2468,6 +2468,7 @@ GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 mtx_trylock F
GLIBC_2.34 mtx_unlock F
GLIBC_2.34 openpty F
GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F
GLIBC_2.34 pthread_attr_getaffinity_np F
GLIBC_2.34 pthread_attr_getguardsize F
GLIBC_2.34 pthread_attr_getstack F