diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-14 00:21:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-14 00:21:23 +0000 |
| commit | 3b15f3497631993c9a2aca40abd691993c0acb79 (patch) | |
| tree | fd4e3a66fa5471772934b2f923c0511656b011eb /pkg/sentry/kernel/signalfd | |
| parent | 04387bed63970c84d62156a9c1b3c6112b9aca21 (diff) | |
| parent | ce58d71fd526587c0ed5e898e3a680c30c02c6d2 (diff) | |
Merge release-20210806.0-29-gce58d71fd (automated)
Diffstat (limited to 'pkg/sentry/kernel/signalfd')
| -rw-r--r-- | pkg/sentry/kernel/signalfd/signalfd.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/signalfd/signalfd.go b/pkg/sentry/kernel/signalfd/signalfd.go index 47958e2d4..9c5e6698c 100644 --- a/pkg/sentry/kernel/signalfd/signalfd.go +++ b/pkg/sentry/kernel/signalfd/signalfd.go @@ -24,7 +24,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sync" - "gvisor.dev/gvisor/pkg/syserror" "gvisor.dev/gvisor/pkg/usermem" "gvisor.dev/gvisor/pkg/waiter" ) @@ -99,7 +98,7 @@ func (s *SignalOperations) Read(ctx context.Context, _ *fs.File, dst usermem.IOS info, err := s.target.Sigtimedwait(s.Mask(), 0) if err != nil { // There must be no signal available. - return 0, syserror.ErrWouldBlock + return 0, linuxerr.ErrWouldBlock } // Copy out the signal info using the specified format. |