From 307217720beb750f5be4fec797b53244def8fd92 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Thu, 17 Dec 2020 12:03:07 -0800 Subject: [PATCH] Fix nil dereference in `newHcsTask` if no shim options were passed Signed-off-by: Daniel Canter --- cmd/containerd-shim-runhcs-v1/task_hcs.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmd/containerd-shim-runhcs-v1/task_hcs.go b/cmd/containerd-shim-runhcs-v1/task_hcs.go index 825864eeea..aa93019e1f 100644 --- a/cmd/containerd-shim-runhcs-v1/task_hcs.go +++ b/cmd/containerd-shim-runhcs-v1/task_hcs.go @@ -145,13 +145,17 @@ func newHcsTask( } opts := hcsoci.CreateOptions{ - ID: req.ID, - Owner: owner, - Spec: s, - HostingSystem: parent, - NetworkNamespace: netNS, - ScaleCPULimitsToSandbox: shimOpts.ScaleCpuLimitsToSandbox, + ID: req.ID, + Owner: owner, + Spec: s, + HostingSystem: parent, + NetworkNamespace: netNS, } + + if shimOpts != nil { + opts.ScaleCPULimitsToSandbox = shimOpts.ScaleCpuLimitsToSandbox + } + system, resources, err := hcsoci.CreateContainer(ctx, &opts) if err != nil { return nil, err