diff options
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 49 |
1 files changed, 0 insertions, 49 deletions
@@ -26,7 +26,6 @@ #include <stdbool.h> #include <linux/errqueue.h> #include <linux/in6.h> -#include <getopt.h> #include "linux_dep.h" #include "util.h" @@ -38,7 +37,6 @@ #include "epoll_ctl.h" #include "pasta.h" #include "serialise.h" -#include "conf.h" #ifdef HAS_GETRANDOM #include <sys/random.h> #endif @@ -925,53 +923,6 @@ const char *str_ee_origin(const struct sock_extended_err *ee) } /** - * close_open_files() - Close leaked files, but not --fd, stdin, stdout, stderr - * @argc: Argument count - * @argv: Command line options, as we need to skip any file given via --fd - */ -void close_open_files(int argc, char **argv) -{ - const struct option optfd[] = { { "fd", required_argument, NULL, 'F' }, - { 0 }, - }; - long fd = -1; - int name, rc; - - do { - name = getopt_long(argc, argv, "-:F:", optfd, NULL); - - if (name == 'F') - fd = conf_tap_fd(optarg); - } while (name != -1); - - if (fd == -1) { - rc = close_range(STDERR_FILENO + 1, ~0U, CLOSE_RANGE_UNSHARE); - } else if (fd == STDERR_FILENO + 1) { /* Still a single range */ - rc = close_range(STDERR_FILENO + 2, ~0U, CLOSE_RANGE_UNSHARE); - } else { - rc = close_range(STDERR_FILENO + 1, fd - 1, - CLOSE_RANGE_UNSHARE); - if (!rc) - rc = close_range(fd + 1, ~0U, CLOSE_RANGE_UNSHARE); - } - - if (rc) { - if (errno == ENOSYS || errno == EINVAL) { - /* This probably means close_range() or the - * CLOSE_RANGE_UNSHARE flag is not supported by the - * kernel. Not much we can do here except carry on and - * hope for the best. - */ - warn( -"Can't use close_range() to ensure no files leaked by parent"); - } else { - die_perror("Failed to close files leaked by parent"); - } - } - -} - -/** * snprintf_check() - snprintf() wrapper, checking for truncation and errors * @str: Output buffer * @size: Maximum size to write to @str |