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

rootless: reuse existing open_namespace function

Browse Source 
there is already a function for opening a namespace path, reuse it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2021-11-17 10:33:32 +01:00
parent 277d526869
commit 084e32336a
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/rootless/rootless_linux.c
View File

@ -249,6 +249,22 @@ can_use_shortcut ()
return ret;
}
static int
open_namespace (int pid_to_join, const char *ns_file)
{
char ns_path[PATH_MAX];
int ret;
ret = snprintf (ns_path, PATH_MAX, "/proc/%d/ns/%s", pid_to_join, ns_file);
if (ret == PATH_MAX)
{
fprintf (stderr, "internal error: namespace path too long\n");
return -1;
}
return open (ns_path, O_CLOEXEC | O_RDONLY);
}
int
is_fd_inherited(int fd)
{
@ -386,13 +402,11 @@ static void __attribute__((constructor)) init()
uid = geteuid ();
gid = getegid ();
sprintf (path, "/proc/%ld/ns/user", pid);
userns_fd = open (path, O_RDONLY);
userns_fd = open_namespace (pid, "user");
if (userns_fd < 0)
return;
sprintf (path, "/proc/%ld/ns/mnt", pid);
mntns_fd = open (path, O_RDONLY);
mntns_fd = open_namespace (pid, "mnt");
if (mntns_fd < 0)
return;
@ -592,22 +606,6 @@ create_pause_process (const char *pause_pid_file_path, char **argv)
}
}
static int
open_namespace (int pid_to_join, const char *ns_file)
{
char ns_path[PATH_MAX];
int ret;
ret = snprintf (ns_path, PATH_MAX, "/proc/%d/ns/%s", pid_to_join, ns_file);
if (ret == PATH_MAX)
{
fprintf (stderr, "internal error: namespace path too long\n");
return -1;
}
return open (ns_path, O_CLOEXEC | O_RDONLY);
}
static void
join_namespace_or_die (const char *name, int ns_fd)
{