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

rootless: skip usage of filepath.Join

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1507
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano
2018-09-19 15:03:03 +02:00
committed by Atomic Bot
parent 6d1eecf7cf
commit 37b2601a81
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/rootless/rootless_linux.go
View File

@ -9,7 +9,6 @@ import (
"os/exec" "os/exec"
gosignal "os/signal" gosignal "os/signal"
"os/user" "os/user"
"path/filepath"
"runtime" "runtime"
"strconv" "strconv"
"syscall" "syscall"
@ -252,7 +251,7 @@ func readUserNs(path string) (string, error) {
} }
func readUserNsFd(fd uintptr) (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) { func getOwner(fd uintptr) (uintptr, error) {
@ -288,7 +287,7 @@ func getUserNSForPath(path string) (*os.File, error) {
} }
func getUserNSForPid(pid uint) (*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) u, err := os.Open(path)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "cannot open %s", path) return nil, errors.Wrapf(err, "cannot open %s", path)