diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-23 20:22:55 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-23 20:22:55 +0000 |
| commit | f5e7282890c4a0bc42f6b48b0afa2c2cd9513491 (patch) | |
| tree | f99d78cd1c1e5efc52817730eb075cfb9d47d4ca /pkg/flipcall/flipcall.go | |
| parent | a4301bae281c2eed0ac91d396e789c00597e6502 (diff) | |
| parent | dfa4b3b90861a61653d0bef8f144bb4e82d21d78 (diff) | |
Merge release-20210614.0-19-gdfa4b3b90 (automated)
Diffstat (limited to 'pkg/flipcall/flipcall.go')
| -rw-r--r-- | pkg/flipcall/flipcall.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/flipcall/flipcall.go b/pkg/flipcall/flipcall.go index 8d8309a73..f0e4ff487 100644 --- a/pkg/flipcall/flipcall.go +++ b/pkg/flipcall/flipcall.go @@ -22,6 +22,7 @@ import ( "sync/atomic" "golang.org/x/sys/unix" + "gvisor.dev/gvisor/pkg/memutil" ) // An Endpoint provides the ability to synchronously transfer data and control @@ -96,9 +97,9 @@ func (ep *Endpoint) Init(side EndpointSide, pwd PacketWindowDescriptor, opts ... if pwd.Length > math.MaxUint32 { return fmt.Errorf("packet window size (%d) exceeds maximum (%d)", pwd.Length, math.MaxUint32) } - m, e := packetWindowMmap(pwd) - if e != 0 { - return fmt.Errorf("failed to mmap packet window: %v", e) + m, err := memutil.MapFile(0, uintptr(pwd.Length), unix.PROT_READ|unix.PROT_WRITE, unix.MAP_SHARED, uintptr(pwd.FD), uintptr(pwd.Offset)) + if err != nil { + return fmt.Errorf("failed to mmap packet window: %v", err) } ep.packet = m ep.dataCap = uint32(pwd.Length) - uint32(PacketHeaderBytes) |