Merge release-20210601.0-45-g3fcbad509 (automated)

2 files changed, 16 insertions, 10 deletions

diff --git a/pkg/sentry/fsimpl/cgroupfs/base.go b/pkg/sentry/fsimpl/cgroupfs/base.go
index 6512e9cdb..fe9871bdd 100644
--- a/pkg/sentry/fsimpl/cgroupfs/base.go
+++ b/pkg/sentry/fsimpl/cgroupfs/base.go
@@ -133,6 +133,17 @@ func (c *cgroupInode) Controllers() []kernel.CgroupController {
 	return c.fs.kcontrollers
 }
 
+// tasks returns a snapshot of the tasks inside the cgroup.
+func (c *cgroupInode) tasks() []*kernel.Task {
+	c.fs.tasksMu.RLock()
+	defer c.fs.tasksMu.RUnlock()
+	ts := make([]*kernel.Task, 0, len(c.ts))
+	for t := range c.ts {
+		ts = append(ts, t)
+	}
+	return ts
+}
+
 // Enter implements kernel.CgroupImpl.Enter.
 func (c *cgroupInode) Enter(t *kernel.Task) {
 	c.fs.tasksMu.Lock()
@@ -163,10 +174,7 @@ func (d *cgroupProcsData) Generate(ctx context.Context, buf *bytes.Buffer) error
 
 	pgids := make(map[kernel.ThreadID]struct{})
 
-	d.fs.tasksMu.RLock()
-	defer d.fs.tasksMu.RUnlock()
-
-	for task := range d.ts {
+	for _, task := range d.tasks() {
 		// Map dedups pgid, since iterating over all tasks produces multiple
 		// entries for the group leaders.
 		if pgid := currPidns.IDOfThreadGroup(task.ThreadGroup()); pgid != 0 {
@@ -205,10 +213,7 @@ func (d *tasksData) Generate(ctx context.Context, buf *bytes.Buffer) error {
 
 	var pids []kernel.ThreadID
 
-	d.fs.tasksMu.RLock()
-	defer d.fs.tasksMu.RUnlock()
-
-	for task := range d.ts {
+	for _, task := range d.tasks() {
 		if pid := currPidns.IDOfTask(task); pid != 0 {
 			pids = append(pids, pid)
 		}
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 (