suspect nil pointer for HostPathType

c3y1huang · Sep 10, 2017 · 29249e0 · 29249e0
1 parent e821e53
commit 29249e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go
@@ -993,7 +993,7 @@ var supportedHostPathTypes = sets.NewString(
 func validateHostPathType(hostPathType *api.HostPathType, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	if !supportedHostPathTypes.Has(string(*hostPathType)) {
+	if hostPathType != nil && !supportedHostPathTypes.Has(string(*hostPathType)) {
 		allErrs = append(allErrs, field.NotSupported(fldPath, hostPathType, supportedHostPathTypes.List()))
 	}
 

diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go
@@ -106,8 +106,14 @@ func (plugin *hostPathPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts vo
 	}
 
 	path := hostPathVolumeSource.Path
+	pathType := new(v1.HostPathType)
+	if hostPathVolumeSource.Type == nil {
+		*pathType = v1.HostPathUnset
+	} else {
+		pathType = hostPathVolumeSource.Type
+	}
 	return &hostPathMounter{
-		hostPath: &hostPath{path: path, pathType: hostPathVolumeSource.Type, containerized: opts.Containerized},
+		hostPath: &hostPath{path: path, pathType: pathType, containerized: opts.Containerized},
 		readOnly: readOnly,
 	}, nil
 }