diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-03 04:15:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-03 04:15:14 +0000 |
| commit | 0e1d141ffcf7878ff60a3ed1f1c696ecfa8d099e (patch) | |
| tree | 9755d118b4801cb9743df8617128888ab06470e4 /pkg/sentry/kernel/task_exit.go | |
| parent | 3dee9c57344555ab56d44c18c2b9f7c667d2d593 (diff) | |
| parent | 932c8abd0f739bec295ff62cf8fce3dcb7e2d866 (diff) | |
Merge release-20210322.0-38-g932c8abd0 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_exit.go')
| -rw-r--r-- | pkg/sentry/kernel/task_exit.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/task_exit.go b/pkg/sentry/kernel/task_exit.go index ad59e4f60..b1af1a7ef 100644 --- a/pkg/sentry/kernel/task_exit.go +++ b/pkg/sentry/kernel/task_exit.go @@ -275,6 +275,10 @@ func (*runExitMain) execute(t *Task) taskRunState { t.fsContext.DecRef(t) t.fdTable.DecRef(t) + // Detach task from all cgroups. This must happen before potentially the + // last ref to the cgroupfs mount is dropped below. + t.LeaveCgroups() + t.mu.Lock() if t.mountNamespaceVFS2 != nil { t.mountNamespaceVFS2.DecRef(t) |