Merge pull request #12446 from knobunc/bug/bz1412087-securitycontext-nil-dereference-panic

OpenShift Bot · web-flow · commit 38831af7ab4a · 2017-01-11T20:35:05.000-05:00
Merged by openshift-bot
diff --git a/pkg/sdn/plugin/pod_linux.go b/pkg/sdn/plugin/pod_linux.go
@@ -68,7 +68,7 @@ func getBandwidth(pod *kapi.Pod) (string, string, error) {
 func wantsMacvlan(pod *kapi.Pod) (bool, error) {
 	privileged := false
 	for _, container := range pod.Spec.Containers {
-		if container.SecurityContext.Privileged != nil && *container.SecurityContext.Privileged {
+		if container.SecurityContext != nil && container.SecurityContext.Privileged != nil && *container.SecurityContext.Privileged {
 			privileged = true
 			break
 		}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func getBandwidth(pod *kapi.Pod) (string, string, error) {`
`68`	`68`	`func wantsMacvlan(pod *kapi.Pod) (bool, error) {`
`69`	`69`	`privileged := false`
`70`	`70`	`for _, container := range pod.Spec.Containers {`
`71`		`- if container.SecurityContext.Privileged != nil && *container.SecurityContext.Privileged {`
	`71`	`+ if container.SecurityContext != nil && container.SecurityContext.Privileged != nil && *container.SecurityContext.Privileged {`
`72`	`72`	`privileged = true`
`73`	`73`	`break`
`74`	`74`	`}`