[v6,4/5] io: Add closefrom [BZ #10353]
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
The function closes all open file descriptors greater than or equal to
input argument. Negative values are clamped to 0, i.e, it will close
all file descriptors.
As indicated by the bug report, this is a common symbol provided by
different systems (Solaris, OpenBSD, NetBSD, FreeBSD) and, although
its has inherent issues with not taking in consideration internal libc
file descriptors (such as syslog), this is also a common feature used
in multiple projects [1][2][3][4][5].
The Linux fallback implementation iterates over /proc and close all
file descriptors sequentially. Although it was raised the questioning
whether getdents on /proc/self/fd might return disjointed entries
when file descriptor are closed; it does not seems the case on my
testing on multiple kernel (v4.18, v5.4, v5.9) and the same strategy
is used on different projects [1][2][3][5].
Also, the interface is set a fail-safe meaning that a failure in the
fallback results in a process abort.
Checked on x86_64-linux-gnu on kernel v5.11 and v5.4.
[1] https://github.com/systemd/systemd/blob/5238e9575906297608ff802a27e2ff9effa3b338/src/basic/fd-util.c#L217
[2] https://github.com/lxc/lxc/blob/ddf4b77e11a4d08f09b7b9cd13e593f8c047edc5/src/lxc/start.c#L236
[3] https://github.com/python/cpython/blob/9e4f2f3a6b8ee995c365e86d976937c141d867f8/Modules/_posixsubprocess.c#L220
[4] https://github.com/rust-lang/rust/blob/5f47c0613ed4eb46fca3633c1297364c09e5e451/src/libstd/sys/unix/process2.rs#L303-L308
[5] https://github.com/openjdk/jdk/blob/master/src/java.base/unix/native/libjava/childproc.c#L82
---
NEWS | 4 +
include/unistd.h | 1 +
io/Makefile | 4 +-
io/Versions | 3 +
io/closefrom.c | 34 ++++
io/tst-closefrom.c | 152 ++++++++++++++++++
manual/llio.texi | 10 ++
posix/unistd.h | 6 +
sysdeps/mach/hurd/i386/libc.abilist | 1 +
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/aarch64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/alpha/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arc/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arm/be/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arm/le/libc.abilist | 1 +
sysdeps/unix/sysv/linux/closefrom.c | 35 ++++
sysdeps/unix/sysv/linux/closefrom_fallback.c | 97 +++++++++++
sysdeps/unix/sysv/linux/csky/libc.abilist | 1 +
sysdeps/unix/sysv/linux/hppa/libc.abilist | 1 +
sysdeps/unix/sysv/linux/i386/libc.abilist | 1 +
sysdeps/unix/sysv/linux/ia64/libc.abilist | 1 +
.../sysv/linux/m68k/coldfire/libc.abilist | 1 +
.../unix/sysv/linux/m68k/m680x0/libc.abilist | 1 +
.../sysv/linux/microblaze/be/libc.abilist | 1 +
.../sysv/linux/microblaze/le/libc.abilist | 1 +
.../sysv/linux/mips/mips32/fpu/libc.abilist | 1 +
.../sysv/linux/mips/mips32/nofpu/libc.abilist | 1 +
.../sysv/linux/mips/mips64/n32/libc.abilist | 1 +
.../sysv/linux/mips/mips64/n64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 +
.../linux/powerpc/powerpc32/fpu/libc.abilist | 1 +
.../powerpc/powerpc32/nofpu/libc.abilist | 1 +
.../linux/powerpc/powerpc64/be/libc.abilist | 1 +
.../linux/powerpc/powerpc64/le/libc.abilist | 1 +
.../unix/sysv/linux/riscv/rv32/libc.abilist | 1 +
.../unix/sysv/linux/riscv/rv64/libc.abilist | 1 +
.../unix/sysv/linux/s390/s390-32/libc.abilist | 1 +
.../unix/sysv/linux/s390/s390-64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sh/be/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sh/le/libc.abilist | 1 +
.../sysv/linux/sparc/sparc32/libc.abilist | 1 +
.../sysv/linux/sparc/sparc64/libc.abilist | 1 +
.../unix/sysv/linux/x86_64/64/libc.abilist | 1 +
.../unix/sysv/linux/x86_64/x32/libc.abilist | 1 +
44 files changed, 380 insertions(+), 2 deletions(-)
create mode 100644 io/closefrom.c
create mode 100644 io/tst-closefrom.c
create mode 100644 sysdeps/unix/sysv/linux/closefrom.c
create mode 100644 sysdeps/unix/sysv/linux/closefrom_fallback.c
Comments
Hello,
I'm part of a team at Rice University developing HPCToolkit, a
fine-grained sampling-based performance analysis tool. Recently we have
been sharing our experiences using the LD_AUDIT framework with the
community, this patch series came to our attention as the subject of a
long-standing issue we have run into multiple times with our tool.
The performance measurement portion of our tool runs as a library
preloaded into the application, sharing the address space and (more
importantly) file descriptors. As mentioned previously in this thread
there are a number of projects which at times close all open file
descriptors not known to the application (often via iteration over
/proc/self/fd). We have found that in most cases this will also close
our own file descriptors with no warning, causing us to corrupt and lose
valuable measurement data, especially for highly multi-threaded
applications.
In response to this problem we have considered reserving file
descriptors above the RLIMIT_NOFILE limit, a technique used by Valgrind
[7,8] where file descriptors are opened early in the process and then
the limit is lowered below them (Valgrind intercepts getrlimit to report
modified limits to the application, we would use setrlimit to lower the
limit instead). While this does not remove their entries from
/proc/self/fd (they are still valid open file descriptors), a number of
projects that close all open file descriptors support this technique by
only closing descriptors within the RLIMIT_NOFILE bound (obtained
directly or indirectly through getdtablesize) [1][3][4][6].
Two of the three implementations of closefrom provided by this patch *do
not* support this technique (specific locations marked below). Not only
is this inconsistent, it directly affects in-process tools like
HPCToolkit as applications shift to using modern Glibc extensions.
We recommend that this be adjusted before this patch is accepted into
upstream Glibc, and that support for this technique be tested in
tst-closefrom.c.
-Jonathon
[1]
https://github.com/systemd/systemd/blob/5238e9575906297608ff802a27e2ff9effa3b338/src/basic/fd-util.c#L203-L204
[3]
https://github.com/python/cpython/blob/9e4f2f3a6b8ee995c365e86d976937c141d867f8/Modules/_posixsubprocess.c#L196-L200
[4]
https://github.com/rust-lang/rust/blob/5f47c0613ed4eb46fca3633c1297364c09e5e451/src/libstd/sys/unix/process2.rs#L161-L164
[6]
https://hg.mozilla.org/mozilla-central/file/tip/ipc/chromium/src/base/process_util_posix.cc#l152
[7]
https://sourceware.org/git/?p=valgrind.git;a=blob;f=coregrind/m_main.c;hb=393732dda164c1cc0fc511eadc0b8f06008ade4f#l1125
[8]
https://sourceware.org/git/?p=valgrind.git;a=blob;f=coregrind/m_syswrap/syswrap-generic.c;hb=393732dda164c1cc0fc511eadc0b8f06008ade4f#l3609
On 6/23/21 1:51 PM, Adhemerval Zanella via Libc-alpha wrote:
> diff --git a/sysdeps/unix/sysv/linux/closefrom.c b/sysdeps/unix/sysv/linux/closefrom.c
> new file mode 100644
> index 0000000000..f5d7342c2c
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/closefrom.c
> @@ -0,0 +1,35 @@
> +/* Close a range of file descriptors. 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/>. */
> +
> +#include <stdio.h>
> +#include <sys/param.h>
> +#include <unistd.h>
> +
> +void
> +__closefrom (int lowfd)
> +{
> + int l = MAX (0, lowfd);
> +
> + int r = __close_range (l, ~0U, 0);
The upper limit `~0U` should be changed to `__getdtablesize()` or similar.
> + if (r == 0)
> + return;
> +
> + if (!__closefrom_fallback (l))
> + __fortify_fail ("closefrom failed to close a file descriptor");
> +}
> +weak_alias (__closefrom, closefrom)
> diff --git a/sysdeps/unix/sysv/linux/closefrom_fallback.c b/sysdeps/unix/sysv/linux/closefrom_fallback.c
> new file mode 100644
> index 0000000000..61e71d388d
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/closefrom_fallback.c
> @@ -0,0 +1,97 @@
> +/* Close a range of file descriptors. 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/>. */
> +
> +#include <arch-fd_to_filename.h>
> +#include <dirent.h>
> +#include <not-cancel.h>
> +#include <stdbool.h>
> +
> +/* Fallback code: iterates over /proc/self/fd, closing each file descriptor
> + that fall on the criteria. */
> +_Bool
> +__closefrom_fallback (int from)
> +{
> + bool ret = false;
> +
> + int dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
> + 0);
> + if (dirfd == -1)
> + {
> + /* The closefrom should work even when process can't open new files. */
> + if (errno == ENOENT)
> + goto err;
> +
> + for (int i = from; i < INT_MAX; i++)
> + {
> + int r = __close_nocancel (i);
> + if (r == 0 || (r == -1 && errno != EBADF))
> + break;
> + }
> +
> + dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
> + 0);
> + if (dirfd == -1)
> + goto err;
> + }
> +
> + char buffer[1024];
> + while (true)
> + {
> + ssize_t ret = __getdents64 (dirfd, buffer, sizeof (buffer));
> + if (ret == -1)
> + goto err;
> + else if (ret == 0)
> + break;
> +
> + /* If any file descriptor is closed it resets the /proc/self position
> + read again from the start (to obtain any possible kernel update). */
> + bool closed = false;
> + char *begin = buffer, *end = buffer + ret;
> + while (begin != end)
> + {
> + unsigned short int d_reclen;
> + memcpy (&d_reclen, begin + offsetof (struct dirent64, d_reclen),
> + sizeof (d_reclen));
> + const char *dname = begin + offsetof (struct dirent64, d_name);
> + begin += d_reclen;
> +
> + if (dname[0] == '.')
> + continue;
> +
> + int fd = 0;
> + for (const char *s = dname; (unsigned int) (*s) - '0' < 10; s++)
> + fd = 10 * fd + (*s - '0');
> +
> + if (fd == dirfd || fd < from)
> + continue;
An extra condition here should check that `fd < __getdtablesize()` or
similar.
> +
> + /* We ignore close errors because EBADF, EINTR, and EIO means the
> + descriptor has been released. */
> + __close_nocancel (fd);
> + closed = true;
> + }
> +
> + if (closed && __lseek (dirfd, 0, SEEK_SET) < 0)
> + goto err;
> + }
> +
> + ret = true;
> +err:
> + __close_nocancel (dirfd);
> + return ret;
> +}
On 03/07/2021 11:45, Jonathon Anderson via Libc-alpha wrote:
> Hello,
>
> I'm part of a team at Rice University developing HPCToolkit, a fine-grained sampling-based performance analysis tool. Recently we have been sharing our experiences using the LD_AUDIT framework with the community, this patch series came to our attention as the subject of a long-standing issue we have run into multiple times with our tool.
>
> The performance measurement portion of our tool runs as a library preloaded into the application, sharing the address space and (more importantly) file descriptors. As mentioned previously in this thread there are a number of projects which at times close all open file descriptors not known to the application (often via iteration over /proc/self/fd). We have found that in most cases this will also close our own file descriptors with no warning, causing us to corrupt and lose valuable measurement data, especially for highly multi-threaded applications.
>
> In response to this problem we have considered reserving file descriptors above the RLIMIT_NOFILE limit, a technique used by Valgrind [7,8] where file descriptors are opened early in the process and then the limit is lowered below them (Valgrind intercepts getrlimit to report modified limits to the application, we would use setrlimit to lower the limit instead). While this does not remove their entries from /proc/self/fd (they are still valid open file descriptors), a number of projects that close all open file descriptors support this technique by only closing descriptors within the RLIMIT_NOFILE bound (obtained directly or indirectly through getdtablesize) [1][3][4][6].
>
> Two of the three implementations of closefrom provided by this patch *do not* support this technique (specific locations marked below). Not only is this inconsistent, it directly affects in-process tools like HPCToolkit as applications shift to using modern Glibc extensions.
>
> We recommend that this be adjusted before this patch is accepted into upstream Glibc, and that support for this technique be tested in tst-closefrom.c.
My initial idea is follow the the current closefrom() semantic provided by
some BSDs (FreeBSD and OpenBSD) which do not consult the current limit and
just use the higher limit for the syscall.
And my understanding of other libraries and programs that use RLIMIT_NOFILE
to get the higher file limit is only for *fallback* implementations and to
to have a somewhat bounded execution time (the cpython have a comment
stating it [1])
The systemd code you posted for instance will *only* check against
get_max_fd() iff "/proc/self/fd" can not be opened, otherwise it will
interact over *all* opened files regardless. This is also the same
for cypthon [2]. I can't really comment on the Rust implementation,
but if it only relying to RLIMIT_NOFILE it will most likely suffer
for file descriptor leakage in some scenarios (if a library does the
same trick as you described).
So sorry, but I think this not the best semantic for closefrom() and it also
does not help a program that uses close_range. In fact, this specific semantic
might indeed make users prefer close_range instead.
Valgrind can overwrite it because it make is invisible to user program and
libc, and for your tool I think the best course of action would be to
interpose closefrom() and clone_range() and exclude the file descriptors
you want to keep it opened.
[1] https://github.com/python/cpython/blob/9e4f2f3a6b8ee995c365e86d976937c141d867f8/Modules/_posixsubprocess.c#L213
[2] https://github.com/python/cpython/blob/9e4f2f3a6b8ee995c365e86d976937c141d867f8/Modules/_posixsubprocess.c#L281
>
> -Jonathon
>
> [1] https://github.com/systemd/systemd/blob/5238e9575906297608ff802a27e2ff9effa3b338/src/basic/fd-util.c#L203-L204
> [3] https://github.com/python/cpython/blob/9e4f2f3a6b8ee995c365e86d976937c141d867f8/Modules/_posixsubprocess.c#L196-L200
> [4] https://github.com/rust-lang/rust/blob/5f47c0613ed4eb46fca3633c1297364c09e5e451/src/libstd/sys/unix/process2.rs#L161-L164
> [6] https://hg.mozilla.org/mozilla-central/file/tip/ipc/chromium/src/base/process_util_posix.cc#l152
> [7] https://sourceware.org/git/?p=valgrind.git;a=blob;f=coregrind/m_main.c;hb=393732dda164c1cc0fc511eadc0b8f06008ade4f#l1125
> [8] https://sourceware.org/git/?p=valgrind.git;a=blob;f=coregrind/m_syswrap/syswrap-generic.c;hb=393732dda164c1cc0fc511eadc0b8f06008ade4f#l3609
>
> On 6/23/21 1:51 PM, Adhemerval Zanella via Libc-alpha wrote:
>> diff --git a/sysdeps/unix/sysv/linux/closefrom.c b/sysdeps/unix/sysv/linux/closefrom.c
>> new file mode 100644
>> index 0000000000..f5d7342c2c
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/closefrom.c
>> @@ -0,0 +1,35 @@
>> +/* Close a range of file descriptors. 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/>. */
>> +
>> +#include <stdio.h>
>> +#include <sys/param.h>
>> +#include <unistd.h>
>> +
>> +void
>> +__closefrom (int lowfd)
>> +{
>> + int l = MAX (0, lowfd);
>> +
>> + int r = __close_range (l, ~0U, 0);
> The upper limit `~0U` should be changed to `__getdtablesize()` or similar.
>> + if (r == 0)
>> + return;
>> +
>> + if (!__closefrom_fallback (l))
>> + __fortify_fail ("closefrom failed to close a file descriptor");
>> +}
>> +weak_alias (__closefrom, closefrom)
>> diff --git a/sysdeps/unix/sysv/linux/closefrom_fallback.c b/sysdeps/unix/sysv/linux/closefrom_fallback.c
>> new file mode 100644
>> index 0000000000..61e71d388d
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/closefrom_fallback.c
>> @@ -0,0 +1,97 @@
>> +/* Close a range of file descriptors. 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/>. */
>> +
>> +#include <arch-fd_to_filename.h>
>> +#include <dirent.h>
>> +#include <not-cancel.h>
>> +#include <stdbool.h>
>> +
>> +/* Fallback code: iterates over /proc/self/fd, closing each file descriptor
>> + that fall on the criteria. */
>> +_Bool
>> +__closefrom_fallback (int from)
>> +{
>> + bool ret = false;
>> +
>> + int dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
>> + 0);
>> + if (dirfd == -1)
>> + {
>> + /* The closefrom should work even when process can't open new files. */
>> + if (errno == ENOENT)
>> + goto err;
>> +
>> + for (int i = from; i < INT_MAX; i++)
>> + {
>> + int r = __close_nocancel (i);
>> + if (r == 0 || (r == -1 && errno != EBADF))
>> + break;
>> + }
>> +
>> + dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
>> + 0);
>> + if (dirfd == -1)
>> + goto err;
>> + }
>> +
>> + char buffer[1024];
>> + while (true)
>> + {
>> + ssize_t ret = __getdents64 (dirfd, buffer, sizeof (buffer));
>> + if (ret == -1)
>> + goto err;
>> + else if (ret == 0)
>> + break;
>> +
>> + /* If any file descriptor is closed it resets the /proc/self position
>> + read again from the start (to obtain any possible kernel update). */
>> + bool closed = false;
>> + char *begin = buffer, *end = buffer + ret;
>> + while (begin != end)
>> + {
>> + unsigned short int d_reclen;
>> + memcpy (&d_reclen, begin + offsetof (struct dirent64, d_reclen),
>> + sizeof (d_reclen));
>> + const char *dname = begin + offsetof (struct dirent64, d_name);
>> + begin += d_reclen;
>> +
>> + if (dname[0] == '.')
>> + continue;
>> +
>> + int fd = 0;
>> + for (const char *s = dname; (unsigned int) (*s) - '0' < 10; s++)
>> + fd = 10 * fd + (*s - '0');
>> +
>> + if (fd == dirfd || fd < from)
>> + continue;
> An extra condition here should check that `fd < __getdtablesize()` or similar.
>> +
>> + /* We ignore close errors because EBADF, EINTR, and EIO means the
>> + descriptor has been released. */
>> + __close_nocancel (fd);
>> + closed = true;
>> + }
>> +
>> + if (closed && __lseek (dirfd, 0, SEEK_SET) < 0)
>> + goto err;
>> + }
>> +
>> + ret = true;
>> +err:
>> + __close_nocancel (dirfd);
>> + return ret;
>> +}
* Adhemerval Zanella via Libc-alpha:
> Valgrind can overwrite it because it make is invisible to user program and
> libc, and for your tool I think the best course of action would be to
> interpose closefrom() and clone_range() and exclude the file descriptors
> you want to keep it opened.
I agree.
Just to be clear: glibc will not clean up descriptors behind the
application's back. The application has to request that, so interposing
the call should be sufficient for your purposes.
(We even have a policy of not opening long-term file descriptors for
internal use because we know that extra file descriptors confuse many
applications.)
Thanks,
Florian
@@ -50,6 +50,10 @@ Major new features:
* On Linux, the close_range function has been added. It allows efficiently
closing a range of file descriptors on recent kernels (version 5.9).
+* The function closefrom has been added. It closes all file descriptors
+ greater than given integer. This function is a GNU extension, although it
+ also present in other systems.
+
Deprecated and removed features, and other changes affecting compatibility:
* The function pthread_mutex_consistent_np has been deprecated; programs
@@ -156,6 +156,7 @@ extern int __brk (void *__addr) attribute_hidden;
extern int __close (int __fd);
libc_hidden_proto (__close)
extern int __libc_close (int __fd);
+extern _Bool __closefrom_fallback (int __lowfd) attribute_hidden;
extern ssize_t __read (int __fd, void *__buf, size_t __nbytes);
libc_hidden_proto (__read)
extern ssize_t __write (int __fd, const void *__buf, size_t __n);
@@ -56,7 +56,8 @@ routines := \
sendfile sendfile64 copy_file_range \
utimensat futimens file_change_detection \
fts64-time64 \
- ftw64-time64
+ ftw64-time64 \
+ closefrom
others := pwd
test-srcs := ftwtest ftwtest-time64
@@ -77,6 +78,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \
tst-lutimes \
tst-futimens \
tst-utimensat \
+ tst-closefrom \
tests-time64 := \
tst-futimens-time64 \
@@ -137,6 +137,9 @@ libc {
stat; stat64; fstat; fstat64; lstat; lstat64; fstatat; fstatat64;
mknod; mknodat;
}
+ GLIBC_2.34 {
+ closefrom;
+ }
GLIBC_PRIVATE {
__libc_fcntl64;
__fcntl_nocancel;
new file mode 100644
@@ -0,0 +1,34 @@
+/* Close a range of file descriptors.
+ 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/>. */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <not-cancel.h>
+
+void
+__closefrom (int lowfd)
+{
+ int maxfd = __getdtablesize ();
+ if (maxfd == -1)
+ __fortify_fail ("closefrom failed to get the file descriptor table size");
+
+ for (int i = 0; i < maxfd; i++)
+ if (i >= lowfd)
+ __close_nocancel_nostatus (i);
+}
+weak_alias (__closefrom, closefrom)
new file mode 100644
@@ -0,0 +1,152 @@
+/* Smoke test for the closefrom.
+ 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/>. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/resource.h>
+#include <unistd.h>
+
+#include <support/check.h>
+#include <support/descriptors.h>
+#include <support/xunistd.h>
+
+#include <array_length.h>
+
+#define NFDS 100
+
+static int
+open_multiple_temp_files (void)
+{
+ /* Check if the temporary file descriptor has no no gaps. */
+ int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
+ for (int i = 1; i <= NFDS; i++)
+ TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), lowfd + i);
+ return lowfd;
+}
+
+static int
+closefrom_test (void)
+{
+ struct support_descriptors *descrs = support_descriptors_list ();
+
+ int lowfd = open_multiple_temp_files ();
+
+ const int maximum_fd = lowfd + NFDS;
+ const int half_fd = lowfd + NFDS / 2;
+ const int gap = maximum_fd / 4;
+
+ /* Close half of the descriptors and check result. */
+ closefrom (half_fd);
+
+ for (int i = half_fd; i <= maximum_fd; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ for (int i = 0; i < half_fd; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Create some gaps, close up to a threshold, and check result. */
+ xclose (lowfd + 35);
+ xclose (lowfd + 38);
+ xclose (lowfd + 42);
+ xclose (lowfd + 46);
+
+ /* Close half of the descriptors and check result. */
+ closefrom (gap);
+ for (int i = gap + 1; i < maximum_fd; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ for (int i = 0; i < gap; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Close the remmaining but the last one. */
+ closefrom (lowfd + 1);
+ for (int i = lowfd + 1; i <= maximum_fd; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ TEST_VERIFY (fcntl (lowfd, F_GETFL) > -1);
+
+ /* Close the last one. */
+ closefrom (lowfd);
+ TEST_COMPARE (fcntl (lowfd, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+
+ /* Double check by check the /proc. */
+ support_descriptors_check (descrs);
+ support_descriptors_free (descrs);
+
+ return 0;
+}
+
+/* Check if closefrom works even when no new file descriptors can be
+ created. */
+static int
+closefrom_test_file_desc_limit (void)
+{
+ int max_fd = NFDS;
+ {
+ struct rlimit rl;
+ if (getrlimit (RLIMIT_NOFILE, &rl) == -1)
+ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m");
+
+ max_fd = (rl.rlim_cur < max_fd ? rl.rlim_cur : max_fd);
+ rl.rlim_cur = max_fd;
+
+ if (setrlimit (RLIMIT_NOFILE, &rl) == 1)
+ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m");
+ }
+
+ /* Exhauste the file descriptor limit. */
+ int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
+ for (;;)
+ {
+ int fd = open ("/dev/null", O_RDONLY, 0600);
+ if (fd == -1)
+ {
+ if (errno != EMFILE)
+ FAIL_EXIT1 ("open: %m");
+ break;
+ }
+ TEST_VERIFY_EXIT (fd < max_fd);
+ }
+
+ closefrom (lowfd);
+ for (int i = lowfd; i < NFDS; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+
+ return 0;
+}
+
+static int
+do_test (void)
+{
+ closefrom_test ();
+ closefrom_test_file_desc_limit ();
+
+ return 0;
+}
+
+#include <support/test-driver.c>
@@ -328,6 +328,16 @@ The maximum number of file descriptors is controlled by the
@end table
@end deftypefun
+@deftypefun void closefrom (int @var{lowfd})
+@standards{GNU, unistd.h}
+@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{@acsfd{}}}
+
+The function @code{closefrom} closes all file descriptors larger than or equal
+to @var{lowfd} then @var{lowfd}. This function is similar to call
+@code{close} applied to the specified file descriptor range.
+
+Already closed file descriptors are ignored.
+@end deftypefun
@node I/O Primitives
@section Input and Output Primitives
@@ -357,6 +357,12 @@ extern __off64_t lseek64 (int __fd, __off64_t __offset, int __whence)
__THROW. */
extern int close (int __fd);
+#ifdef __USE_MISC
+/* Close all open file descriptors greater than or equal to LOWFD.
+ Negative LOWFD is clamped to 0. */
+extern void closefrom (int __lowfd) __THROW;
+#endif
+
/* Read NBYTES into BUF from FD. Return the
number read, -1 for errors or 0 for EOF.
@@ -2218,6 +2218,7 @@ GLIBC_2.33 stat64 F
GLIBC_2.34 __isnanf128 F
GLIBC_2.34 __libc_start_main F
GLIBC_2.34 _hurd_libc_proc_init F
+GLIBC_2.34 closefrom F
GLIBC_2.34 dladdr F
GLIBC_2.34 dladdr1 F
GLIBC_2.34 dlclose F
@@ -64,7 +64,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \
pselect32 \
xstat fxstat lxstat xstat64 fxstat64 lxstat64 \
fxstatat fxstatat64 \
- xmknod xmknodat convert_scm_timestamps
+ xmknod xmknodat convert_scm_timestamps \
+ closefrom_fallback
CFLAGS-gethostid.c = -fexceptions
CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
@@ -2350,6 +2350,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2443,6 +2443,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2109,6 +2109,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -280,6 +280,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -277,6 +277,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
new file mode 100644
@@ -0,0 +1,35 @@
+/* Close a range of file descriptors. 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/>. */
+
+#include <stdio.h>
+#include <sys/param.h>
+#include <unistd.h>
+
+void
+__closefrom (int lowfd)
+{
+ int l = MAX (0, lowfd);
+
+ int r = __close_range (l, ~0U, 0);
+ if (r == 0)
+ return;
+
+ if (!__closefrom_fallback (l))
+ __fortify_fail ("closefrom failed to close a file descriptor");
+}
+weak_alias (__closefrom, closefrom)
new file mode 100644
@@ -0,0 +1,97 @@
+/* Close a range of file descriptors. 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/>. */
+
+#include <arch-fd_to_filename.h>
+#include <dirent.h>
+#include <not-cancel.h>
+#include <stdbool.h>
+
+/* Fallback code: iterates over /proc/self/fd, closing each file descriptor
+ that fall on the criteria. */
+_Bool
+__closefrom_fallback (int from)
+{
+ bool ret = false;
+
+ int dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
+ 0);
+ if (dirfd == -1)
+ {
+ /* The closefrom should work even when process can't open new files. */
+ if (errno == ENOENT)
+ goto err;
+
+ for (int i = from; i < INT_MAX; i++)
+ {
+ int r = __close_nocancel (i);
+ if (r == 0 || (r == -1 && errno != EBADF))
+ break;
+ }
+
+ dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
+ 0);
+ if (dirfd == -1)
+ goto err;
+ }
+
+ char buffer[1024];
+ while (true)
+ {
+ ssize_t ret = __getdents64 (dirfd, buffer, sizeof (buffer));
+ if (ret == -1)
+ goto err;
+ else if (ret == 0)
+ break;
+
+ /* If any file descriptor is closed it resets the /proc/self position
+ read again from the start (to obtain any possible kernel update). */
+ bool closed = false;
+ char *begin = buffer, *end = buffer + ret;
+ while (begin != end)
+ {
+ unsigned short int d_reclen;
+ memcpy (&d_reclen, begin + offsetof (struct dirent64, d_reclen),
+ sizeof (d_reclen));
+ const char *dname = begin + offsetof (struct dirent64, d_name);
+ begin += d_reclen;
+
+ if (dname[0] == '.')
+ continue;
+
+ int fd = 0;
+ for (const char *s = dname; (unsigned int) (*s) - '0' < 10; s++)
+ fd = 10 * fd + (*s - '0');
+
+ if (fd == dirfd || fd < from)
+ continue;
+
+ /* We ignore close errors because EBADF, EINTR, and EIO means the
+ descriptor has been released. */
+ __close_nocancel (fd);
+ closed = true;
+ }
+
+ if (closed && __lseek (dirfd, 0, SEEK_SET) < 0)
+ goto err;
+ }
+
+ ret = true;
+err:
+ __close_nocancel (dirfd);
+ return ret;
+}
@@ -2369,6 +2369,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2323,6 +2323,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2507,6 +2507,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2283,6 +2283,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -281,6 +281,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2450,6 +2450,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2420,6 +2420,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2417,6 +2417,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2415,6 +2415,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2413,6 +2413,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2421,6 +2421,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2339,6 +2339,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2459,6 +2459,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2477,6 +2477,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2510,6 +2510,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2247,6 +2247,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2546,6 +2546,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2111,6 +2111,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2311,6 +2311,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2475,6 +2475,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2284,6 +2284,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2330,6 +2330,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2327,6 +2327,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2468,6 +2468,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2304,6 +2304,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2262,6 +2262,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
@@ -2365,6 +2365,7 @@ GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 call_once F
GLIBC_2.34 close_range F
+GLIBC_2.34 closefrom F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F