diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 10:04:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 10:04:10 -0500 |
commit | 55ad6188b067ba6594819c318dd2ae92dea2f27e (patch) | |
tree | ba30a34e670229237efc607502802848ef3b3d77 /vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go | |
parent | 59b1cdf9bb1c97475f369c0ca2b27ce2eaa1a0d4 (diff) | |
parent | 4adf457ff3619fd8b99f025c5ea67b7dac96fea8 (diff) | |
download | podman-55ad6188b067ba6594819c318dd2ae92dea2f27e.tar.gz podman-55ad6188b067ba6594819c318dd2ae92dea2f27e.tar.bz2 podman-55ad6188b067ba6594819c318dd2ae92dea2f27e.zip |
Merge pull request #12900 from containers/dependabot/go_modules/github.com/opencontainers/runc-1.1.0
Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go')
-rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go index cd78f23e1..6b9fc3435 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go @@ -11,7 +11,7 @@ import ( "strings" "unsafe" - "github.com/cyphar/filepath-securejoin" + securejoin "github.com/cyphar/filepath-securejoin" "golang.org/x/sys/unix" ) @@ -33,16 +33,6 @@ func init() { } } -// ResolveRootfs ensures that the current working directory is -// not a symlink and returns the absolute path to the rootfs -func ResolveRootfs(uncleanRootfs string) (string, error) { - rootfs, err := filepath.Abs(uncleanRootfs) - if err != nil { - return "", err - } - return filepath.EvalSymlinks(rootfs) -} - // ExitStatus returns the correct exit status for a process based on if it // was signaled or exited cleanly func ExitStatus(status unix.WaitStatus) int { @@ -120,7 +110,7 @@ func WithProcfd(root, unsafePath string, fn func(procfd string) error) error { unsafePath = stripRoot(root, unsafePath) path, err := securejoin.SecureJoin(root, unsafePath) if err != nil { - return fmt.Errorf("resolving path inside rootfs failed: %v", err) + return fmt.Errorf("resolving path inside rootfs failed: %w", err) } // Open the target path. |