diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-03-24 19:17:38 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-24 19:17:38 +0000 |
| commit | 7c81294c74085963b68bc1f25d1e9ecc8cf346b7 (patch) | |
| tree | c8f1c85453f0327014a34ca049fb3c93c9dc84d2 /pkg/sentry/fsimpl/signalfd | |
| parent | 9662600f3fc56cfce16d9cf407964b0bac0cc150 (diff) | |
| parent | e7ca2a51a89a8ff2c9f5adfdfa5b51be1b3faeb3 (diff) | |
Merge release-20210315.0-23-ge7ca2a51a (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/signalfd')
| -rw-r--r-- | pkg/sentry/fsimpl/signalfd/signalfd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/signalfd/signalfd.go b/pkg/sentry/fsimpl/signalfd/signalfd.go index 246bd87bc..a7f5928b7 100644 --- a/pkg/sentry/fsimpl/signalfd/signalfd.go +++ b/pkg/sentry/fsimpl/signalfd/signalfd.go @@ -117,8 +117,8 @@ func (sfd *SignalFileDescription) Read(ctx context.Context, dst usermem.IOSequen func (sfd *SignalFileDescription) Readiness(mask waiter.EventMask) waiter.EventMask { sfd.mu.Lock() defer sfd.mu.Unlock() - if mask&waiter.EventIn != 0 && sfd.target.PendingSignals()&sfd.mask != 0 { - return waiter.EventIn // Pending signals. + if mask&waiter.ReadableEvents != 0 && sfd.target.PendingSignals()&sfd.mask != 0 { + return waiter.ReadableEvents // Pending signals. } return 0 } |