diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-05 14:28:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 14:28:19 -0500 |
| commit | 7597fa47b9564d4034ec40fe8048c0a3db201cc5 (patch) | |
| tree | 884844acba4ad9efef7b72a82b9e5a338681b78c /vendor | |
| parent | 82081e8112ab14d08815ac77b76a78d465e4c7b3 (diff) | |
| parent | ce4265af83aca3a30909476b21b8f000a90011e3 (diff) | |
| download | podman-7597fa47b9564d4034ec40fe8048c0a3db201cc5.tar.gz podman-7597fa47b9564d4034ec40fe8048c0a3db201cc5.tar.bz2 podman-7597fa47b9564d4034ec40fe8048c0a3db201cc5.zip | |
Merge pull request #9242 from lsm5/v3.0
[backport v3.0] Bump github.com/containernetworking/cni from 0.8.0 to 0.8.1
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containernetworking/cni/pkg/invoke/find.go | 5 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/find.go b/vendor/github.com/containernetworking/cni/pkg/invoke/find.go index e815404c8..e62029eb7 100644 --- a/vendor/github.com/containernetworking/cni/pkg/invoke/find.go +++ b/vendor/github.com/containernetworking/cni/pkg/invoke/find.go @@ -18,6 +18,7 @@ import ( "fmt" "os" "path/filepath" + "strings" ) // FindInPath returns the full path of the plugin by searching in the provided path @@ -26,6 +27,10 @@ func FindInPath(plugin string, paths []string) (string, error) { return "", fmt.Errorf("no plugin name provided") } + if strings.ContainsRune(plugin, os.PathSeparator) { + return "", fmt.Errorf("invalid plugin name: %s", plugin) + } + if len(paths) == 0 { return "", fmt.Errorf("no paths provided") } diff --git a/vendor/modules.txt b/vendor/modules.txt index d412ff90f..8e856b7f1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -55,7 +55,7 @@ github.com/containerd/containerd/sys # github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb github.com/containerd/continuity/fs github.com/containerd/continuity/sysx -# github.com/containernetworking/cni v0.8.0 +# github.com/containernetworking/cni v0.8.1 github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke github.com/containernetworking/cni/pkg/types |