github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1315 from crosbymichael/lchown

Browse Source 
Use lchown when remapping rootfs
This commit is contained in:
Phil Estes
2017-08-09 11:36:10 -04:00
committed by GitHub
parent ef344c14ba 1f6b10b699
commit f3ff1e223b
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec_unix.go
View File

@@ -6,12 +6,10 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"syscall" "syscall"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/containerd/containerd/fs"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
) )
@@ -179,15 +177,8 @@ func incrementFS(root string, uidInc, gidInc uint32) filepath.WalkFunc {
var ( var (
stat = info.Sys().(*syscall.Stat_t) stat = info.Sys().(*syscall.Stat_t)
u, g = int(stat.Uid + uidInc), int(stat.Gid + gidInc) u, g = int(stat.Uid + uidInc), int(stat.Gid + gidInc)
symlink = info.Mode()&os.ModeSymlink != 0
) )
// make sure we resolve links inside the root for symlinks // be sure the lchown the path as to not de-reference the symlink to a host file
if path, err = fs.RootPath(root, strings.TrimPrefix(path, root)); err != nil { return os.Lchown(path, u, g)
return err
}
if err := os.Chown(path, u, g); err != nil && !symlink {
return err
}
return nil
} }
} }