summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-10-15 00:50:38 +0000
committergVisor bot <gvisor-bot@google.com>2019-10-15 00:50:38 +0000
commit40839ad7f447aaa49178d1011ad1c1d955023559 (patch)
treee7640e9486de18fc02f0aa2f18b0edf2b7ab324b /runsc/cmd
parent9c1433ed43bab10e9bc79831b4830ffc0e7e6ee1 (diff)
parentbfa0bb24dd73072b3ccfe302afa89d1b5d46b927 (diff)
Merge release-20190806.1-270-gbfa0bb2 (automated)
Diffstat (limited to 'runsc/cmd')
-rw-r--r--runsc/cmd/gofer.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index fbd579fb8..4c2fb80bf 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -423,7 +423,7 @@ func resolveSymlinksImpl(root, base, rel string, followCount uint) (string, erro
path := filepath.Join(base, name)
if !strings.HasPrefix(path, root) {
// One cannot '..' their way out of root.
- path = root
+ base = root
continue
}
fi, err := os.Lstat(path)