From 6ff285bce38e6b26e0437f449e834037b4ca141e Mon Sep 17 00:00:00 2001 From: linyouchong Date: Sat, 14 Jul 2018 10:42:42 +0800 Subject: [PATCH] fix nil pointer dereference in node_container_manager#enforceExistingCgroup --- pkg/kubelet/cm/node_container_manager.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/kubelet/cm/node_container_manager.go b/pkg/kubelet/cm/node_container_manager.go index 6c1e022c2f..1267b3f7d6 100644 --- a/pkg/kubelet/cm/node_container_manager.go +++ b/pkg/kubelet/cm/node_container_manager.go @@ -131,6 +131,9 @@ func enforceExistingCgroup(cgroupManager CgroupManager, cName CgroupName, rl v1. Name: cName, ResourceParameters: getCgroupConfig(rl), } + if cgroupConfig.ResourceParameters == nil { + return fmt.Errorf("%q cgroup is not config properly", cgroupConfig.Name) + } glog.V(4).Infof("Enforcing limits on cgroup %q with %d cpu shares and %d bytes of memory", cName, cgroupConfig.ResourceParameters.CpuShares, cgroupConfig.ResourceParameters.Memory) if !cgroupManager.Exists(cgroupConfig.Name) { return fmt.Errorf("%q cgroup does not exist", cgroupConfig.Name)