opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2967 from giuseppe/fix-rootless-close

Browse Source 
rootless: not close more FDs than needed
This commit is contained in:
OpenShift Merge Robot
2019-04-18 06:50:25 -07:00
committed by GitHub
parent 5260d33f95 0dfb61d806
commit 4d45f5180f
1 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/rootless/rootless_linux.c
View File

@ -16,11 +16,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <dirent.h> #include <dirent.h>
#include <sys/select.h>
static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces"; static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
static int n_files; static int open_files_max_fd;
fd_set open_files_set;
static void __attribute__((constructor)) init() static void __attribute__((constructor)) init()
{ {
@ -32,11 +34,16 @@ static void __attribute__((constructor)) init()
{ {
struct dirent *ent; struct dirent *ent;
FD_ZERO (&open_files_set);
for (ent = readdir (d); ent; ent = readdir (d)) for (ent = readdir (d); ent; ent = readdir (d))
{ {
int fd = atoi (ent->d_name); int fd = atoi (ent->d_name);
if (fd > n_files && fd != dirfd (d)) if (fd != dirfd (d))
n_files = fd; {
if (fd > open_files_max_fd)
open_files_max_fd = fd;
FD_SET (fd, &open_files_set);
}
} }
closedir (d); closedir (d);
} }
@ -164,8 +171,11 @@ reexec_userns_join (int userns, int mountns)
{ {
/* We passed down these fds, close them. */ /* We passed down these fds, close them. */
int f; int f;
for (f = 3; f < n_files; f++) for (f = 3; f < open_files_max_fd; f++)
close (f); {
if (FD_ISSET (f, &open_files_set))
close (f);
}
return pid; return pid;
} }
@ -274,22 +284,25 @@ reexec_in_user_namespace (int ready)
check_proc_sys_userns_file (_max_user_namespaces); check_proc_sys_userns_file (_max_user_namespaces);
check_proc_sys_userns_file (_unprivileged_user_namespaces); check_proc_sys_userns_file (_unprivileged_user_namespaces);
} }
if (pid) { if (pid)
if (do_socket_activation) { {
long num_fds; if (do_socket_activation)
num_fds = strtol(listen_fds, NULL, 10); {
if (num_fds != LONG_MIN && num_fds != LONG_MAX) { long num_fds;
long i; num_fds = strtol (listen_fds, NULL, 10);
for (i = 0; i < num_fds; i++) { if (num_fds != LONG_MIN && num_fds != LONG_MAX)
close(3+i); {
long i;
for (i = 3; i < num_fds + 3; i++)
if (FD_ISSET (i, &open_files_set))
close (i);
}
unsetenv ("LISTEN_PID");
unsetenv ("LISTEN_FDS");
unsetenv ("LISTEN_FDNAMES");
} }
} return pid;
unsetenv("LISTEN_PID");
unsetenv("LISTEN_FDS");
unsetenv("LISTEN_FDNAMES");
} }
return pid;
}
argv = get_cmd_line_args (ppid); argv = get_cmd_line_args (ppid);
if (argv == NULL) if (argv == NULL)
@ -300,8 +313,8 @@ reexec_in_user_namespace (int ready)
if (do_socket_activation) { if (do_socket_activation) {
char s[32]; char s[32];
sprintf(s, "%d", getpid()); sprintf (s, "%d", getpid());
setenv("LISTEN_PID", s, true); setenv ("LISTEN_PID", s, true);
} }
setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1); setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1);