summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/rpcinet
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-08-08 19:06:30 +0000
committergVisor bot <gvisor-bot@google.com>2019-08-08 19:06:30 +0000
commit4f3f4cd15b73ab00d6423717cf9bfb2b8b709779 (patch)
treee8d9c9ca516dcc402e241e190b35aacf2b26568f /pkg/sentry/socket/rpcinet
parent553386081533b271f0c80e58d4a20f0f834e5348 (diff)
parent2e45d1696e41d9042164b1b05d0dcd39dd15dfce (diff)
Merge 2e45d169 (automated)
Diffstat (limited to 'pkg/sentry/socket/rpcinet')
-rw-r--r--pkg/sentry/socket/rpcinet/notifier/notifier.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/socket/rpcinet/notifier/notifier.go b/pkg/sentry/socket/rpcinet/notifier/notifier.go
index aa157dd51..7efe4301f 100644
--- a/pkg/sentry/socket/rpcinet/notifier/notifier.go
+++ b/pkg/sentry/socket/rpcinet/notifier/notifier.go
@@ -20,6 +20,7 @@ import (
"sync"
"syscall"
+ "golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/conn"
pb "gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/syscall_rpc_go_proto"
"gvisor.dev/gvisor/pkg/waiter"
@@ -76,7 +77,7 @@ func (n *Notifier) waitFD(fd uint32, fi *fdInfo, mask waiter.EventMask) error {
}
e := pb.EpollEvent{
- Events: mask.ToLinux() | -syscall.EPOLLET,
+ Events: mask.ToLinux() | unix.EPOLLET,
Fd: fd,
}