Skip to content

K
k3s
Commit a185fa7b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40701 from sjenning/fix-nil-deref

Automatic merge from submit-queue (batch tested with PRs 38443, 40145, 40701, 40682) fix nil deref in exec admission Fixes #40615 @ncdc @jsravn @smarterclayton
parents 0c15857a 071c66a0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
plugin/pkg/admission/exec/admission.go
View file @ a185fa7b
...@@ -110,7 +110,7 @@ func (d *denyExec) Admit(a admission.Attributes) (err error) { ...@@ -110,7 +110,7 @@ func (d *denyExec) Admit(a admission.Attributes) (err error) {
// isPrivileged will return true a pod has any privileged containers // isPrivileged will return true a pod has any privileged containers
func isPrivileged(pod *api.Pod) bool { func isPrivileged(pod *api.Pod) bool {
for _, c := range pod.Spec.InitContainers { for _, c := range pod.Spec.InitContainers {
if c.SecurityContext == nil { if c.SecurityContext == nil || c.SecurityContext.Privileged == nil {
continue continue
} }
if *c.SecurityContext.Privileged { if *c.SecurityContext.Privileged {
...@@ -118,7 +118,7 @@ func isPrivileged(pod *api.Pod) bool { ...@@ -118,7 +118,7 @@ func isPrivileged(pod *api.Pod) bool {
} }
} }
for _, c := range pod.Spec.Containers { for _, c := range pod.Spec.Containers {
if c.SecurityContext == nil { if c.SecurityContext == nil || c.SecurityContext.Privileged == nil {
continue continue
} }
if *c.SecurityContext.Privileged { if *c.SecurityContext.Privileged {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment