Merge 69e0affa (automated)

1 files changed, 14 insertions, 19 deletions

diff --git a/pkg/sentry/syscalls/linux/sys_epoll.go b/pkg/sentry/syscalls/linux/sys_epoll.go
index 14a61cfa5..4a2b9f061 100644
--- a/pkg/sentry/syscalls/linux/sys_epoll.go
+++ b/pkg/sentry/syscalls/linux/sys_epoll.go
@@ -15,12 +15,10 @@
 package linux
 
 import (
-	"syscall"
-
+	"gvisor.dev/gvisor/pkg/abi/linux"
 	"gvisor.dev/gvisor/pkg/sentry/arch"
 	"gvisor.dev/gvisor/pkg/sentry/kernel"
 	"gvisor.dev/gvisor/pkg/sentry/kernel/epoll"
-	"gvisor.dev/gvisor/pkg/sentry/kernel/kdefs"
 	"gvisor.dev/gvisor/pkg/sentry/syscalls"
 	"gvisor.dev/gvisor/pkg/sentry/usermem"
 	"gvisor.dev/gvisor/pkg/syserror"
@@ -30,11 +28,11 @@ import (
 // EpollCreate1 implements the epoll_create1(2) linux syscall.
 func EpollCreate1(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallControl, error) {
 	flags := args[0].Int()
-	if flags & ^syscall.EPOLL_CLOEXEC != 0 {
+	if flags & ^linux.EPOLL_CLOEXEC != 0 {
 		return 0, nil, syserror.EINVAL
 	}
 
-	closeOnExec := flags&syscall.EPOLL_CLOEXEC != 0
+	closeOnExec := flags&linux.EPOLL_CLOEXEC != 0
 	fd, err := syscalls.CreateEpoll(t, closeOnExec)
 	if err != nil {
 		return 0, nil, err
@@ -61,46 +59,43 @@ func EpollCreate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.S
 
 // EpollCtl implements the epoll_ctl(2) linux syscall.
 func EpollCtl(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallControl, error) {
-	epfd := kdefs.FD(args[0].Int())
+	epfd := args[0].Int()
 	op := args[1].Int()
-	fd := kdefs.FD(args[2].Int())
+	fd := args[2].Int()
 	eventAddr := args[3].Pointer()
 
 	// Capture the event state if needed.
 	flags := epoll.EntryFlags(0)
 	mask := waiter.EventMask(0)
 	var data [2]int32
-	if op != syscall.EPOLL_CTL_DEL {
-		var e syscall.EpollEvent
+	if op != linux.EPOLL_CTL_DEL {
+		var e linux.EpollEvent
 		if _, err := t.CopyIn(eventAddr, &e); err != nil {
 			return 0, nil, err
 		}
 
-		if e.Events&syscall.EPOLLONESHOT != 0 {
+		if e.Events&linux.EPOLLONESHOT != 0 {
 			flags |= epoll.OneShot
 		}
 
-		// syscall.EPOLLET is incorrectly generated as a negative number
-		// in Go, see https://github.com/golang/go/issues/5328 for
-		// details.
-		if e.Events&-syscall.EPOLLET != 0 {
+		if e.Events&linux.EPOLLET != 0 {
 			flags |= epoll.EdgeTriggered
 		}
 
 		mask = waiter.EventMaskFromLinux(e.Events)
 		data[0] = e.Fd
-		data[1] = e.Pad
+		data[1] = e.Data
 	}
 
 	// Perform the requested operations.
 	switch op {
-	case syscall.EPOLL_CTL_ADD:
+	case linux.EPOLL_CTL_ADD:
 		// See fs/eventpoll.c.
 		mask |= waiter.EventHUp | waiter.EventErr
 		return 0, nil, syscalls.AddEpoll(t, epfd, fd, flags, mask, data)
-	case syscall.EPOLL_CTL_DEL:
+	case linux.EPOLL_CTL_DEL:
 		return 0, nil, syscalls.RemoveEpoll(t, epfd, fd)
-	case syscall.EPOLL_CTL_MOD:
+	case linux.EPOLL_CTL_MOD:
 		// Same as EPOLL_CTL_ADD.
 		mask |= waiter.EventHUp | waiter.EventErr
 		return 0, nil, syscalls.UpdateEpoll(t, epfd, fd, flags, mask, data)
@@ -132,7 +127,7 @@ func copyOutEvents(t *kernel.Task, addr usermem.Addr, e []epoll.Event) error {
 
 // EpollWait implements the epoll_wait(2) linux syscall.
 func EpollWait(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallControl, error) {
-	epfd := kdefs.FD(args[0].Int())
+	epfd := args[0].Int()
 	eventsAddr := args[1].Pointer()
 	maxEvents := int(args[2].Int())
 	timeout := int(args[3].Int())