Merge pull request cri-o#5448 from haircommander/fix-cgroupv2-test

openshift-merge-robot · web-flow · commit f9a112389057 · 2021-11-09T11:55:26.000+01:00
server: fix segfault when using cgroupv2
diff --git a/server/container_create_linux.go b/server/container_create_linux.go
@@ -395,7 +395,10 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrIface.Contai
 				}
 			}
 
-			if node.CgroupIsV2() {
+			if node.CgroupIsV2() && len(resources.Unified) != 0 {
+				if specgen.Config.Linux.Resources.Unified == nil {
+					specgen.Config.Linux.Resources.Unified = make(map[string]string, len(resources.Unified))
+				}
 				for key, value := range resources.Unified {
 					specgen.Config.Linux.Resources.Unified[key] = value
 				}

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,10 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrIface.Contai`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`
`398`		`- if node.CgroupIsV2() {`
	`398`	`+ if node.CgroupIsV2() && len(resources.Unified) != 0 {`
	`399`	`+ if specgen.Config.Linux.Resources.Unified == nil {`
	`400`	`+ specgen.Config.Linux.Resources.Unified = make(map[string]string, len(resources.Unified))`
	`401`	`+ }`
`399`	`402`	`for key, value := range resources.Unified {`
`400`	`403`	`specgen.Config.Linux.Resources.Unified[key] = value`
`401`	`404`	`}`