Merge pull request #10775 from vrothberg/3.2-fix-cp

[v3.2] cp: do not allow dir->file copying

1 files changed, 8 insertions, 0 deletions

diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index 27aacc6e5..0be135c91 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -179,6 +179,10 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 		containerTarget = filepath.Dir(containerTarget)
 	}
 
+	if !isStdout && containerInfo.IsDir && !hostInfo.IsDir {
+		return errors.New("destination must be a directory when copying a directory")
+	}
+
 	reader, writer := io.Pipe()
 	hostCopy := func() error {
 		defer reader.Close()
@@ -336,6 +340,10 @@ func copyToContainer(container string, containerPath string, hostPath string) er
 		stdinFile = tmpFile.Name()
 	}
 
+	if hostInfo.IsDir && !containerInfo.IsDir {
+		return errors.New("destination must be a directory when copying a directory")
+	}
+
 	reader, writer := io.Pipe()
 	hostCopy := func() error {
 		defer writer.Close()