closefrom: Use close_range() on Linux when available Closes: !11 Based-on-patch-by: cptpcrd <cptpcrd.git@gmail.com> Signed-off-by: Guillem Jover <guillem@hadrons.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/src/closefrom.c b/src/closefrom.c
index e2e10a8..087ccad 100644
--- a/src/closefrom.c
+++ b/src/closefrom.c
@@ -19,6 +19,12 @@
#include <config.h>
+#ifdef __linux__
+# include <sys/syscall.h>
+# if defined(__NR_close_range) && !defined(SYS_close_range)
+# define SYS_close_range __NR_close_range
+# endif
+#endif
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
@@ -61,6 +67,14 @@ closefrom_close(int fd)
#endif
}
+#if defined(__linux__) && defined(SYS_close_range)
+static inline int
+sys_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
+{
+ return syscall(SYS_close_range, fd, max_fd, flags);
+}
+#endif
+
/*
* Close all file descriptors greater than or equal to lowfd.
* This is the expensive (fallback) method.
@@ -182,11 +196,16 @@ closefrom(int lowfd)
if (lowfd < 0)
lowfd = 0;
- /* Try the fast method first, if possible. */
+ /* Try the fast methods first, if possible. */
#if defined(HAVE_FCNTL_CLOSEM)
if (fcntl(lowfd, F_CLOSEM, 0) != -1)
return;
#endif /* HAVE_FCNTL_CLOSEM */
+#if defined(__linux__) && defined(SYS_close_range)
+ if (sys_close_range(lowfd, UINT_MAX, 0) == 0)
+ return;
+#endif
+
#if defined(HAVE_PSTAT_GETPROC)
if (closefrom_pstat(lowfd) != -1)
return;