Fixing runc panic during hugetlb pages

Signed-off-by: rajasec <rajasec79@gmail.com>
opencontainers · Oct 14, 2016 · 2d0ccc6 · 2d0ccc6
1 parent d186a75
commit 2d0ccc6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -438,10 +438,12 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
 		}
 	}
 	for _, l := range r.HugepageLimits {
-		c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{
-			Pagesize: *l.Pagesize,
-			Limit:    *l.Limit,
-		})
+		if l.Pagesize != nil && l.Limit != nil {
+			c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{
+				Pagesize: *l.Pagesize,
+				Limit:    *l.Limit,
+			})
+		}
 	}
 	if r.DisableOOMKiller != nil {
 		c.Resources.OomKillDisable = *r.DisableOOMKiller