go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix race in FDTable.GetFDs(). 

PiperOrigin-RevId: 258635459
This commit is contained in:
Bhasker Hariharan 2019-07-17 13:55:32 -07:00 committed by gVisor bot
parent 9f1189130e
commit 542fbd01a7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/sentry/kernel/fd_table.go
View File

@ -81,7 +81,9 @@ type FDTable struct {
// mu protects below. // mu protects below.
mu sync.Mutex `state:"nosave"` mu sync.Mutex `state:"nosave"`
// used contains the number of non-nil entries. // used contains the number of non-nil entries. It must be accessed
// atomically. It may be read atomically without holding mu (but not
// written).
used int32 used int32
// descriptorTable holds descriptors. // descriptorTable holds descriptors.
@ -317,7 +319,7 @@ func (f *FDTable) Get(fd int32) (*fs.File, FDFlags) {
// GetFDs returns a list of valid fds. // GetFDs returns a list of valid fds.
func (f *FDTable) GetFDs() []int32 { func (f *FDTable) GetFDs() []int32 {
fds := make([]int32, 0, f.used) fds := make([]int32, 0, int(atomic.LoadInt32(&f.used)))
f.forEach(func(fd int32, file *fs.File, flags FDFlags) { f.forEach(func(fd int32, file *fs.File, flags FDFlags) {
fds = append(fds, fd) fds = append(fds, fd)
}) })