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

Merge release-20190806.1-259-gf8b1859 (automated)

This commit is contained in:
gVisor bot 2019-10-10 19:57:04 +00:00
parent 0e0abd3b24 f8b1859319
commit de6517c4c3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/sentry/kernel/signalfd/signalfd.go
View File

@ -121,7 +121,10 @@ func (s *SignalOperations) Read(ctx context.Context, _ *fs.File, dst usermem.IOS
// Readiness implements waiter.Waitable.Readiness.
func (s *SignalOperations) Readiness(mask waiter.EventMask) waiter.EventMask {
return mask & waiter.EventIn
if mask&waiter.EventIn != 0 && s.target.PendingSignals()&s.Mask() != 0 {
return waiter.EventIn // Pending signals.
}
return 0
}
// EventRegister implements waiter.Waitable.EventRegister.