github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Avoid panic when spec file is missing sections under Resources

Browse Source 
Check pointers against nil before dereferencing them. Skip any sections
that are nil, since that's equivalent to having no values defined for
those sections.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann
2016-01-15 16:04:52 -08:00
parent a4576937f9
commit cf9fcdc71a
1 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linux/linux.go
View File

@@ -626,6 +626,7 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
}
cr.Resources = c
r := spec.Linux.Resources
if r.Memory != nil {
if r.Memory.Limit != nil {
c.Memory = int64(*r.Memory.Limit)
}
@@ -641,6 +642,8 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
if r.Memory.Swappiness != nil {
c.MemorySwappiness = int64(*r.Memory.Swappiness)
}
}
if r.CPU != nil {
if r.CPU.Shares != nil {
c.CpuShares = int64(*r.CPU.Shares)
}
@@ -662,12 +665,15 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
if r.CPU.Mems != nil {
c.CpusetMems = *r.CPU.Mems
}
}
if r.BlockIO != nil {
if r.BlockIO.Weight != nil {
c.BlkioWeight = *r.BlockIO.Weight
}
if r.BlockIO.LeafWeight != nil {
c.BlkioLeafWeight = *r.BlockIO.LeafWeight
}
}
for _, wd := range r.BlockIO.WeightDevice {
weightDevice := configs.NewWeightDevice(wd.Major, wd.Minor, *wd.Weight, *wd.LeafWeight)
c.BlkioWeightDevice = append(c.BlkioWeightDevice, weightDevice)
@@ -695,6 +701,7 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
})
}
c.OomKillDisable = r.DisableOOMKiller != nil && *r.DisableOOMKiller
if r.Network != nil {
c.NetClsClassid = r.Network.ClassID
for _, m := range r.Network.Priorities {
c.NetPrioIfpriomap = append(c.NetPrioIfpriomap, &configs.IfPrioMap{
@@ -702,6 +709,7 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
Priority: int64(m.Priority),
})
}
}
return cr, nil
}