From 3325b6e29063441ffc767ea650a4058203324097 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 24 Jun 2014 12:50:44 -0400 Subject: [PATCH] fix bug in FollowSymlinkInScope when link == root Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 2 +- components/engine/pkg/symlink/fs.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index fc71f01820..c4261a081c 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -945,4 +945,4 @@ func TestModeHostname(t *testing.T) { deleteAllContainers() logDone("run - hostname and several network modes") -} +} \ No newline at end of file diff --git a/components/engine/pkg/symlink/fs.go b/components/engine/pkg/symlink/fs.go index 257491f91b..32ca06b780 100644 --- a/components/engine/pkg/symlink/fs.go +++ b/components/engine/pkg/symlink/fs.go @@ -13,8 +13,6 @@ const maxLoopCounter = 100 // FollowSymlink will follow an existing link and scope it to the root // path provided. func FollowSymlinkInScope(link, root string) (string, error) { - prev := "/" - root, err := filepath.Abs(root) if err != nil { return "", err @@ -25,10 +23,17 @@ func FollowSymlinkInScope(link, root string) (string, error) { return "", err } + if link == root { + return root, nil + } + + if !strings.HasPrefix(filepath.Dir(link), root) { return "", fmt.Errorf("%s is not within %s", link, root) } + prev := "/" + for _, p := range strings.Split(link, "/") { prev = filepath.Join(prev, p) prev = filepath.Clean(prev)