Skip to content

Commit 5fcee14

Browse files
FedeDPpoiana
authored andcommitted
fix(plugins/container): avoid possible nil ptr dereference in cri and containerd engines.
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
1 parent 2bb872e commit 5fcee14

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

plugins/container/go-worker/pkg/container/containerd.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@ func (c *containerdEngine) Listen(ctx context.Context, wg *sync.WaitGroup) (<-ch
301301
case <-ctx.Done():
302302
return
303303
case ev := <-eventsCh:
304+
if ev == nil {
305+
// Nothing to do for null event
306+
break
307+
}
304308
var (
305309
id string
306310
isCreate bool

plugins/container/go-worker/pkg/container/cri.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,10 @@ func (c *criEngine) Listen(ctx context.Context, wg *sync.WaitGroup) (<-chan even
462462
case <-ctx.Done():
463463
return
464464
case evt := <-containerEventsCh:
465+
if evt == nil {
466+
// Nothing to do for nil event
467+
break
468+
}
465469
switch evt.ContainerEventType {
466470
case v1.ContainerEventType_CONTAINER_CREATED_EVENT:
467471
if !config.IsHookEnabled(config.HookCreate) {

0 commit comments

Comments
 (0)