Merge pull request opencontainers#1116 from rajasec/hugetlb-panic

hqhq · web-flow · commit a6284a7bdb11 · 2016-10-17T13:55:59.000+08:00
Fixing runc panic during hugetlb pages
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -438,6 +438,9 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
 		}
 	}
 	for _, l := range r.HugepageLimits {
+		if l.Pagesize == nil || l.Limit == nil {
+			return nil, fmt.Errorf("pagesize and limit can not be empty")
+		}
 		c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{
 			Pagesize: *l.Pagesize,
 			Limit:    *l.Limit,

Original file line number	Diff line number	Diff line change
`@@ -438,6 +438,9 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec specs.Spec) (`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`	`for _, l := range r.HugepageLimits {`
	`441`	`+ if l.Pagesize == nil \|\| l.Limit == nil {`
	`442`	`+ return nil, fmt.Errorf("pagesize and limit can not be empty")`
	`443`	`+ }`
`441`	`444`	`c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{`
`442`	`445`	`Pagesize: *l.Pagesize,`
`443`	`446`	`Limit: *l.Limit,`