fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 13:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysdeps: Use close_range() if available

Browse source 
The version with no flags set, which is a slight generalization of
closefrom(), is available on recent Linux and FreeBSD.

The version with CLOSE_RANGE_CLOEXEC is Linux-specific.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-03-01 19:33:06 +00:00
parent faa3b2ef4a
commit ee694ade61
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/ConfigureChecks.cmake
View file

@ -53,6 +53,7 @@ check_symbol_exists(setenv "stdlib.h" HAVE_SETENV) #
check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV) # dbus-sysdeps.c
check_symbol_exists(clearenv "stdlib.h" HAVE_CLEARENV) # dbus-sysdeps.c
check_symbol_exists(closefrom "unistd.h" HAVE_CLOSEFROM) # dbus-sysdeps-unix.c
check_symbol_exists(close_range "unistd.h" HAVE_CLOSE_RANGE) # dbus-sysdeps-unix.c
check_symbol_exists(writev "sys/uio.h" HAVE_WRITEV) # dbus-sysdeps.c, dbus-sysdeps-win.c
check_symbol_exists(setrlimit "sys/resource.h" HAVE_SETRLIMIT) # dbus-sysdeps.c, dbus-sysdeps-win.c, test/test-segfault.c
check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # dbus-sysdeps.c

3
cmake/config.h.cmake
View file

@ -204,6 +204,9 @@
/* Define to 1 if you have closefrom */
#cmakedefine HAVE_CLOSEFROM 1
/* Define to 1 if you have close_range */
#cmakedefine HAVE_CLOSE_RANGE 1
/* Define to 1 if you have writev */
#cmakedefine HAVE_WRITEV 1

1
configure.ac
View file

@ -382,6 +382,7 @@ AS_IF([test x$enable_code_coverage = xyes],[
AC_CHECK_FUNCS_ONCE([
accept4
clearenv
close_range
closefrom
fpathconf
getgrouplist

11
dbus/dbus-sysdeps-unix.c
View file

@ -37,6 +37,7 @@
#include "dbus-credentials.h"
#include "dbus-nonce.h"
#include <limits.h>
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
@ -4796,6 +4797,11 @@ act_on_fds_3_and_up (void (*func) (int fd))
void
_dbus_close_all (void)
{
#ifdef HAVE_CLOSE_RANGE
if (close_range (3, INT_MAX, 0) == 0)
return;
#endif
/* Some library implementations of closefrom() are not async-signal-safe,
* and we call _dbus_close_all() after forking, so we only do this on
* operating systems where we know that closefrom() is a system call */
@ -4818,6 +4824,11 @@ _dbus_close_all (void)
void
_dbus_fd_set_all_close_on_exec (void)
{
#if defined(HAVE_CLOSE_RANGE) && defined(CLOSE_RANGE_CLOEXEC)
if (close_range (3, INT_MAX, CLOSE_RANGE_CLOEXEC) == 0)
return;
#endif
act_on_fds_3_and_up (_dbus_fd_set_close_on_exec);
}