diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-01 09:03:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 09:03:44 -0700 |
| commit | 7a5696316a03df5dddded9c3afa8bf26acd74678 (patch) | |
| tree | 466277b936d314f23fba2eb44d0d9a446f9a4508 /libpod | |
| parent | 4fe49f5840025bc971793d1be747f0ecd9f7cc24 (diff) | |
| parent | ec940b08c6149d91cf969cb9b56299058c739735 (diff) | |
| download | podman-7a5696316a03df5dddded9c3afa8bf26acd74678.tar.gz podman-7a5696316a03df5dddded9c3afa8bf26acd74678.tar.bz2 podman-7a5696316a03df5dddded9c3afa8bf26acd74678.zip | |
Merge pull request #4139 from giuseppe/fix-segfault-missing-slirp4netns
networking: fix segfault when slirp4netns is missing
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 4 | ||||
| -rw-r--r-- | libpod/oci_internal_linux.go | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index f1456548b..a4dcd23be 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -622,6 +622,10 @@ func (c *Container) refresh() error { return err } + if rootless.IsRootless() { + return nil + } + return c.refreshCNI() } diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go index a5cce795b..437b7cf4d 100644 --- a/libpod/oci_internal_linux.go +++ b/libpod/oci_internal_linux.go @@ -137,8 +137,12 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Containe return errors.Wrapf(err, "failed to create rootless network sync pipe") } } else { - defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncR) - defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncW) + if ctr.rootlessSlirpSyncR != nil { + defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncR) + } + if ctr.rootlessSlirpSyncW != nil { + defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncW) + } } // Leak one end in conmon, the other one will be leaked into slirp4netns cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessSlirpSyncW) |