Merge pull request #5106 from tonistiigi/executor-cancel-return

executor: fix cancellation before start signal
moby · Jul 2, 2024 · 74c6f57 · 74c6f57
2 parents a08a9b6 + 7089987
commit 74c6f57
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
@@ -610,9 +610,14 @@ func runcProcessHandle(ctx context.Context, killer procKiller) (*procHandle, con
 	go func() {
 		// Wait for pid
 		select {
-		case <-ctx.Done():
+		case <-p.ended:
 			return // nothing to kill
 		case <-p.ready:
+			select {
+			case <-p.ended:
+				return
+			default:
+			}
 		}
 
 		for {