netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix strace for epoll event arrays.

Browse Source 
PiperOrigin-RevId: 323491461
This commit is contained in:
Jamie Liu
2020-07-27 19:27:14 -07:00
committed by gVisor bot
parent b0eafc7454
commit 18c2463596
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/strace/epoll.go
+5 -5
View File
@@ -50,10 +50,10 @@ func epollEvents(t *kernel.Task, eventsAddr usermem.Addr, numEvents, maxBytes ui
sb.WriteString("...")
break
}
if _, ok := addr.AddLength(uint64(linux.SizeOfEpollEvent)); !ok {
fmt.Fprintf(&sb, "{error reading event at %#x: EFAULT}", addr)
continue
}
// Allowing addr to overflow is consistent with Linux, and harmless; if
// this isn't the last iteration of the loop, the next call to CopyIn
// will just fail with EFAULT.
addr, _ = addr.AddLength(uint64(linux.SizeOfEpollEvent))
}
sb.WriteString("}")
return sb.String()
@@ -75,7 +75,7 @@ var epollEventEvents = abi.FlagSet{
{Flag: linux.EPOLLPRI, Name: "EPOLLPRI"},
{Flag: linux.EPOLLOUT, Name: "EPOLLOUT"},
{Flag: linux.EPOLLERR, Name: "EPOLLERR"},
{Flag: linux.EPOLLHUP, Name: "EPULLHUP"},
{Flag: linux.EPOLLHUP, Name: "EPOLLHUP"},
{Flag: linux.EPOLLRDNORM, Name: "EPOLLRDNORM"},
{Flag: linux.EPOLLRDBAND, Name: "EPOLLRDBAND"},
{Flag: linux.EPOLLWRNORM, Name: "EPOLLWRNORM"},