diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-15 00:22:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-15 00:22:23 +0000 |
| commit | 018771a9909fb8c35f179c48d836484571570841 (patch) | |
| tree | c6b8f7b403493af81af9c78dff26380ce061ab39 /pkg/sentry/syscalls/linux | |
| parent | 2a4ab311c9589f91320568210ce5f12e0622652c (diff) | |
| parent | a5069f820f22734b6c466068a02bbbe83ba091da (diff) | |
Merge release-20200211.0-25-ga5069f8 (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_epoll.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_epoll.go b/pkg/sentry/syscalls/linux/sys_epoll.go index 5f11b496c..fbef5b376 100644 --- a/pkg/sentry/syscalls/linux/sys_epoll.go +++ b/pkg/sentry/syscalls/linux/sys_epoll.go @@ -83,8 +83,7 @@ func EpollCtl(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sysc } mask = waiter.EventMaskFromLinux(e.Events) - data[0] = e.Fd - data[1] = e.Data + data = e.Data } // Perform the requested operations. |