summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-05-29 16:35:16 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-05-29 22:53:51 -0400
commit79990b7364310d256e4dbaf7adc2b451adda854f (patch)
tree61ca922dcf1c0666d0ce29069e976b0be4cbc189 /cmd/podman
parent431e633b48fbfc486c332c8374d14fd6e0073840 (diff)
downloadpodman-79990b7364310d256e4dbaf7adc2b451adda854f.tar.gz
podman-79990b7364310d256e4dbaf7adc2b451adda854f.tar.bz2
podman-79990b7364310d256e4dbaf7adc2b451adda854f.zip
Tolerate non-running containers in paused cp
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/cp.go21
1 files changed, 15 insertions, 6 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go
index 7092da5e7..a0677071d 100644
--- a/cmd/podman/cp.go
+++ b/cmd/podman/cp.go
@@ -97,13 +97,22 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin
if pause {
if err := ctr.Pause(); err != nil {
- return err
- }
- defer func() {
- if err := ctr.Unpause(); err != nil {
- logrus.Errorf("Error unpausing container after copying: %v", err)
+ // An invalid state error is fine.
+ // The container isn't running or is already paused.
+ // TODO: We can potentially start the container while
+ // the copy is running, which still allows a race where
+ // malicious code could mess with the symlink.
+ if errors.Cause(err) != libpod.ErrCtrStateInvalid {
+ return err
}
- }()
+ } else if err == nil {
+ // Only add the defer if we actually paused
+ defer func() {
+ if err := ctr.Unpause(); err != nil {
+ logrus.Errorf("Error unpausing container after copying: %v", err)
+ }
+ }()
+ }
}
user, err := getUser(mountPoint, ctr.User())