diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-22 20:40:39 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-22 20:40:39 +0000 |
| commit | 993bee6697b0e371d902f18b81787c14d12180f5 (patch) | |
| tree | 0a35ed69a975448d874b765fbae6e229dd19621b /pkg/tcpip/transport/icmp | |
| parent | 77dfca5954fab10c93faff1236d9e42d84defc22 (diff) | |
| parent | 6c0e1d9cfe6adbfbb32e7020d6426608ac63ad37 (diff) | |
Merge release-20210112.0-74-g6c0e1d9cf (automated)
Diffstat (limited to 'pkg/tcpip/transport/icmp')
| -rw-r--r-- | pkg/tcpip/transport/icmp/endpoint.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/tcpip/transport/icmp/endpoint.go b/pkg/tcpip/transport/icmp/endpoint.go index 256e19296..af00ed548 100644 --- a/pkg/tcpip/transport/icmp/endpoint.go +++ b/pkg/tcpip/transport/icmp/endpoint.go @@ -313,11 +313,12 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, *tc route = r } - v, err := p.FullPayload() - if err != nil { - return 0, err + v := make([]byte, p.Len()) + if _, err := io.ReadFull(p, v); err != nil { + return 0, tcpip.ErrBadBuffer } + var err *tcpip.Error switch e.NetProto { case header.IPv4ProtocolNumber: err = send4(route, e.ID.LocalPort, v, e.ttl, e.owner) |