oci: always close chControl

haircommander · haircommander · commit a216d3d247e9 · 2021-11-01T15:43:52.000-04:00
Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git a/internal/oci/oci.go b/internal/oci/oci.go
@@ -128,6 +128,7 @@ func (r *Runtime) WaitContainerStateStopped(ctx context.Context, c *Container) e
 
 	done := make(chan error, 1)
 	chControl := make(chan struct{}, 1)
+	defer close(chControl)
 	go func() {
 		defer close(done)
 		for {
@@ -152,10 +153,8 @@ func (r *Runtime) WaitContainerStateStopped(ctx context.Context, c *Container) e
 	case err = <-done:
 		break
 	case <-ctx.Done():
-		close(chControl)
 		return ctx.Err()
 	case <-time.After(time.Duration(r.config.CtrStopTimeout) * time.Second):
-		close(chControl)
 		return fmt.Errorf(
 			"failed to get container stopped status: %ds timeout reached",
 			r.config.CtrStopTimeout,
