diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-01 19:10:02 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-01 19:10:02 +0000 |
| commit | 9a66a5f3083af2d041ec1427ce67642be7aa6d9e (patch) | |
| tree | 0d8bd6dcef07aadc55ab8ea8500d106b24b77fef /pkg/sentry/vfs/epoll.go | |
| parent | 28291a5a5d25633c8bdf45ed5affe90f779c74b4 (diff) | |
| parent | 590b8d3e99dd24d2bb625d00fa99fbc9296dfe2b (diff) | |
Merge release-20210628.0-16-g590b8d3e9 (automated)
Diffstat (limited to 'pkg/sentry/vfs/epoll.go')
| -rw-r--r-- | pkg/sentry/vfs/epoll.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/vfs/epoll.go b/pkg/sentry/vfs/epoll.go index ae004b371..a93e757f8 100644 --- a/pkg/sentry/vfs/epoll.go +++ b/pkg/sentry/vfs/epoll.go @@ -17,6 +17,7 @@ package vfs import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/context" + "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/syserror" "gvisor.dev/gvisor/pkg/waiter" @@ -174,7 +175,7 @@ func (ep *EpollInstance) AddInterest(file *FileDescription, num int32, event lin // that cyclic polling is not introduced after the check. defer epollCycleMu.Unlock() if subep.mightPoll(ep) { - return syserror.ELOOP + return linuxerr.ELOOP } } |