Merge pull request #11590 from xianzhe-databricks:fix-hang-with-subprocess-death

gvisor-bot · gvisor-bot · commit 7a07e2777a48 · 2025-03-28T14:04:12.000-07:00
PiperOrigin-RevId: 741639464
diff --git a/pkg/sentry/kernel/task_run.go b/pkg/sentry/kernel/task_run.go
@@ -356,7 +356,7 @@ func (app *runApp) execute(t *Task) taskRunState {
 	default:
 		// What happened? Can't continue.
 		t.Warningf("Unexpected SwitchToApp error: %v", err)
-		t.PrepareExit(linux.WaitStatusExit(int32(ExtractErrno(err, -1))))
+		t.PrepareGroupExit(linux.WaitStatusTerminationSignal(linux.SIGKILL))
 		return (*runExit)(nil)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ func (app runApp) execute(t Task) taskRunState {`
`356`	`356`	`default:`
`357`	`357`	`// What happened? Can't continue.`
`358`	`358`	`t.Warningf("Unexpected SwitchToApp error: %v", err)`
`359`		`- t.PrepareExit(linux.WaitStatusExit(int32(ExtractErrno(err, -1))))`
	`359`	`+ t.PrepareGroupExit(linux.WaitStatusTerminationSignal(linux.SIGKILL))`
`360`	`360`	`return (*runExit)(nil)`
`361`	`361`	`}`
`362`	`362`	`}`