summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-03 12:07:40 -0500
committerGitHub <noreply@github.com>2021-02-03 12:07:40 -0500
commitbe568738b1d8268c7c799241ef2c73682aeff934 (patch)
tree81122f1298d5417cc3787535431bf4616fcaf0ef /vendor
parent4945abb7d10a0a22925b365e58f3f6793cb22ae1 (diff)
parent9dc795191537149503822acc3171f735a53192f4 (diff)
downloadpodman-be568738b1d8268c7c799241ef2c73682aeff934.tar.gz
podman-be568738b1d8268c7c799241ef2c73682aeff934.tar.bz2
podman-be568738b1d8268c7c799241ef2c73682aeff934.zip
Merge pull request #9215 from containers/dependabot/go_modules/github.com/containernetworking/cni-0.8.1
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.go5
-rw-r--r--vendor/modules.txt2
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 4b0beca94..ff4cf4663 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