From c35a70d21196f43eea84a1ea7da3e92d56479d8b Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Sun, 2 Oct 2022 08:13:19 +0100 Subject: [PATCH] specgen/generate: Avoid a nil dereference in MakePod The value of p.PodSpecGen.InfraContainerSpec.ResourceLimits can be nil on FreeBSD. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- pkg/specgen/generate/pod_create.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 14d390e49f..b99a5457ca 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -49,10 +49,10 @@ func MakePod(p *entities.PodSpec, rt *libpod.Runtime) (*libpod.Pod, error) { if err != nil { return nil, err } - if p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO != nil { + if p.PodSpecGen.InfraContainerSpec.ResourceLimits != nil && + p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO != nil { p.PodSpecGen.ResourceLimits.BlockIO = p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO } - err = specgen.WeightDevices(p.PodSpecGen.InfraContainerSpec) if err != nil { return nil, err