summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorRahat Mahmood <rahat@google.com>2021-10-27 17:58:29 -0700
committergVisor bot <gvisor-bot@google.com>2021-10-27 18:01:34 -0700
commit6078d26588c021d4b78501ad25cb725ff2db797e (patch)
tree13ab267606a17c1c49de620070872281086bf389 /pkg
parent8acc3a9bb2225a5af9e5bf587d2a2baad0e5f841 (diff)
Sychronize access to cpuset controller bitmaps.
Reported-by: syzbot+39d434b96cf7c29a66ad@syzkaller.appspotmail.com Reported-by: syzbot+7c38bce6353d91facca3@syzkaller.appspotmail.com PiperOrigin-RevId: 406024052
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sentry/fsimpl/cgroupfs/cpuset.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkg/sentry/fsimpl/cgroupfs/cpuset.go b/pkg/sentry/fsimpl/cgroupfs/cpuset.go
index 62e7029da..913dde1f7 100644
--- a/pkg/sentry/fsimpl/cgroupfs/cpuset.go
+++ b/pkg/sentry/fsimpl/cgroupfs/cpuset.go
@@ -26,6 +26,7 @@ import (
"gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs"
"gvisor.dev/gvisor/pkg/sentry/kernel"
"gvisor.dev/gvisor/pkg/sentry/kernel/auth"
+ "gvisor.dev/gvisor/pkg/sync"
"gvisor.dev/gvisor/pkg/usermem"
)
@@ -36,6 +37,8 @@ type cpusetController struct {
maxCpus uint32
maxMems uint32
+ mu sync.Mutex `state:"nosave"`
+
cpus *bitmap.Bitmap
mems *bitmap.Bitmap
}
@@ -71,6 +74,8 @@ type cpusData struct {
// Generate implements vfs.DynamicBytesSource.Generate.
func (d *cpusData) Generate(ctx context.Context, buf *bytes.Buffer) error {
+ d.c.mu.Lock()
+ defer d.c.mu.Unlock()
fmt.Fprintf(buf, "%s\n", formatBitmap(d.c.cpus))
return nil
}
@@ -101,6 +106,8 @@ func (d *cpusData) Write(ctx context.Context, src usermem.IOSequence, offset int
return 0, linuxerr.EINVAL
}
+ d.c.mu.Lock()
+ defer d.c.mu.Unlock()
d.c.cpus = b
return int64(n), nil
}
@@ -112,6 +119,8 @@ type memsData struct {
// Generate implements vfs.DynamicBytesSource.Generate.
func (d *memsData) Generate(ctx context.Context, buf *bytes.Buffer) error {
+ d.c.mu.Lock()
+ defer d.c.mu.Unlock()
fmt.Fprintf(buf, "%s\n", formatBitmap(d.c.mems))
return nil
}
@@ -142,6 +151,8 @@ func (d *memsData) Write(ctx context.Context, src usermem.IOSequence, offset int
return 0, linuxerr.EINVAL
}
+ d.c.mu.Lock()
+ defer d.c.mu.Unlock()
d.c.mems = b
return int64(n), nil
}