Skip to content

Commit

Permalink
Fix infinite loop in isPathOnVolume
Browse files Browse the repository at this point in the history
filepath.Dir in some cases returns `.` symbol and calling this function
again returns same result. In such cases this function
never returns and causes some operations to stuck forever.

Closes containers#10216

Signed-off-by: Slava Bacherikov <slava@bacher09.org>
  • Loading branch information
bacher09 committed May 6, 2021
1 parent ed6f399 commit d6fd528
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion libpod/container_path_resolution.go
Expand Up @@ -128,7 +128,7 @@ func isPathOnVolume(c *Container, containerPath string) bool {
if cleanedContainerPath == filepath.Clean(vol.Dest) {
return true
}
for dest := vol.Dest; dest != "/"; dest = filepath.Dir(dest) {
for dest := vol.Dest; dest != "/" && dest != "."; dest = filepath.Dir(dest) {
if cleanedContainerPath == dest {
return true
}
Expand Down
11 changes: 11 additions & 0 deletions test/e2e/run_test.go
Expand Up @@ -921,6 +921,17 @@ USER mail`, BB)
Expect(session.OutputToString()).To(ContainSubstring("mail root"))
})

It("podman run with incorect VOLUME", func() {
dockerfile := fmt.Sprintf(`FROM %s
VOLUME ['/etc/foo']
WORKDIR /etc/foo`, BB)
podmanTest.BuildImage(dockerfile, "test", "false")
session := podmanTest.Podman([]string{"run", "--rm", "test", "echo", "test"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring("test"))
})

It("podman run --volumes-from flag", func() {
vol := filepath.Join(podmanTest.TempDir, "vol-test")
err := os.MkdirAll(vol, 0755)
Expand Down

0 comments on commit d6fd528

Please sign in to comment.