diff options
| author | Rahat Mahmood <rahat@google.com> | 2021-06-10 17:03:28 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-10 17:09:17 -0700 |
| commit | 3fcbad509300ac7249156d49d2ec20f30aa1a16d (patch) | |
| tree | cc9c08601df7f424b845d46ca8baa917259d3dc2 /pkg/sentry/fsimpl/cgroupfs/cgroupfs.go | |
| parent | 0058fca32e8ac367c3d6b4396e1b40740d689b54 (diff) | |
Fix lock ordering issue when enumerating cgroup tasks.
The control files enumerating tasks and threads residing in cgroupfs
incorrectly locks cgroupfs.filesystem.tasksMu before
kernel.TaskSet.mu.
The contents of these control files are inherently racy anyways, so
use a snapshot of the tasks in the cgroup and drop tasksMu before
resolving pids/tids (which acquires TaskSet.mu).
PiperOrigin-RevId: 378767060
Diffstat (limited to 'pkg/sentry/fsimpl/cgroupfs/cgroupfs.go')
| -rw-r--r-- | pkg/sentry/fsimpl/cgroupfs/cgroupfs.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go b/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go index 54050de3c..05d7eb4ce 100644 --- a/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go +++ b/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go @@ -49,8 +49,9 @@ // // kernel.CgroupRegistry.mu // cgroupfs.filesystem.mu -// Task.mu -// cgroupfs.filesystem.tasksMu. +// kernel.TaskSet.mu +// kernel.Task.mu +// cgroupfs.filesystem.tasksMu. package cgroupfs import ( |