Merge pull request #1116 from rajasec/hugetlb-panic

Fixing runc panic during hugetlb pages
opencontainers · Oct 17, 2016 · a6284a7 · a6284a7
2 parents 7be6eda + 4b263c9
commit a6284a7
Showing 1 changed file with 3 additions and 0 deletions.
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,