From 37b2601a81d4f4941691dcbdd525b4645f448a46 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 19 Sep 2018 15:03:03 +0200 Subject: rootless: skip usage of filepath.Join Signed-off-by: Giuseppe Scrivano Closes: #1507 Approved by: rhatdan --- pkg/rootless/rootless_linux.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index a9a914a62..d0c6cfa16 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -9,7 +9,6 @@ import ( "os/exec" gosignal "os/signal" "os/user" - "path/filepath" "runtime" "strconv" "syscall" @@ -252,7 +251,7 @@ func readUserNs(path string) (string, error) { } func readUserNsFd(fd uintptr) (string, error) { - return readUserNs(filepath.Join("/proc/self/fd", fmt.Sprintf("%d", fd))) + return readUserNs(fmt.Sprintf("/proc/self/fd/%d", fd)) } func getOwner(fd uintptr) (uintptr, error) { @@ -288,7 +287,7 @@ func getUserNSForPath(path string) (*os.File, error) { } func getUserNSForPid(pid uint) (*os.File, error) { - path := filepath.Join("/proc", fmt.Sprintf("%d", pid), "ns/user") + path := fmt.Sprintf("/proc/%d/ns/user", pid) u, err := os.Open(path) if err != nil { return nil, errors.Wrapf(err, "cannot open %s", path) -- cgit v1.2.3-54-g00ecf