Merge pull request #367 from q384566678/device-valide

validate: perfect deviceValid
opencontainers · Apr 18, 2017 · 8addcc6 · 8addcc6
2 parents bf28e72 + 1d9db8f
commit 8addcc6
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/validate/validate.go b/validate/validate.go
@@ -684,13 +684,8 @@ func namespaceValid(ns rspec.LinuxNamespace) bool {
 
 func deviceValid(d rspec.LinuxDevice) bool {
 	switch d.Type {
-	case "b":
-	case "c":
-	case "u":
-		if d.Major <= 0 {
-			return false
-		}
-		if d.Minor <= 0 {
+	case "b", "c", "u":
+		if d.Major <= 0 || d.Minor <= 0 {
 			return false
 		}
 	case "p":