diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-31 23:11:33 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-31 23:11:33 +0000 |
| commit | f2ba17db33d7d3c92d622204f58308eb0a85584b (patch) | |
| tree | b14a40db321ff0ab4832e1c0936d2c8bcf86ef60 /pkg/sentry/vfs/epoll.go | |
| parent | edbaf6199dae93eae2d38347e0e10e4c0efa2bc1 (diff) | |
| parent | a7d9aa6d5bfbed11c94578c6a2eb04ce75cbdbe5 (diff) | |
Merge release-20200622.1-300-ga7d9aa6d5 (automated)
Diffstat (limited to 'pkg/sentry/vfs/epoll.go')
| -rw-r--r-- | pkg/sentry/vfs/epoll.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/vfs/epoll.go b/pkg/sentry/vfs/epoll.go index 599c3131c..5b009b928 100644 --- a/pkg/sentry/vfs/epoll.go +++ b/pkg/sentry/vfs/epoll.go @@ -186,7 +186,7 @@ func (ep *EpollInstance) AddInterest(file *FileDescription, num int32, event lin } // Register interest in file. - mask := event.Events | linux.EPOLLERR | linux.EPOLLRDHUP + mask := event.Events | linux.EPOLLERR | linux.EPOLLHUP epi := &epollInterest{ epoll: ep, key: key, @@ -257,7 +257,7 @@ func (ep *EpollInstance) ModifyInterest(file *FileDescription, num int32, event } // Update epi for the next call to ep.ReadEvents(). - mask := event.Events | linux.EPOLLERR | linux.EPOLLRDHUP + mask := event.Events | linux.EPOLLERR | linux.EPOLLHUP ep.mu.Lock() epi.mask = mask epi.userData = event.Data |