From 084e32336aafb5862007f0941485f93bdf78e806 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 17 Nov 2021 10:33:32 +0100 Subject: rootless: reuse existing open_namespace function there is already a function for opening a namespace path, reuse it. Signed-off-by: Giuseppe Scrivano --- pkg/rootless/rootless_linux.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index b60aea855..1dd5ad0a1 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -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) { -- cgit v1.2.3-54-g00ecf