containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19238 from dfr/freebsd-copy 

libpod: use define.TypeBind when resolving container paths
This commit is contained in:
OpenShift Merge Robot 2023-07-14 12:36:20 +02:00 committed by GitHub
parent 265718596c 310a8f1038
commit a56370db48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container_path_resolution.go
View File

@ -5,6 +5,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/containers/podman/v4/libpod/define"
securejoin "github.com/cyphar/filepath-securejoin" securejoin "github.com/cyphar/filepath-securejoin"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -155,7 +156,7 @@ func isPathOnVolume(c *Container, containerPath string) bool {
func findBindMount(c *Container, containerPath string) *specs.Mount { func findBindMount(c *Container, containerPath string) *specs.Mount {
cleanedPath := filepath.Clean(containerPath) cleanedPath := filepath.Clean(containerPath)
for _, m := range c.config.Spec.Mounts { for _, m := range c.config.Spec.Mounts {
if m.Type != "bind" { if m.Type != define.TypeBind {
continue continue
} }
if cleanedPath == filepath.Clean(m.Destination) { if cleanedPath == filepath.Clean(m.Destination) {