diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-01 23:14:25 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-01 23:14:25 +0000 |
| commit | f7891792e2cd4371c22e6a5218dba42df1b14d8b (patch) | |
| tree | eeae48568d09f136ba741a4d96ff4834827927e0 /pkg/tcpip/transport/udp/endpoint.go | |
| parent | a0b1393845a7cd6bf9da3b7d83e5c044989f204e (diff) | |
| parent | 5e1e61fbcbe8fa3cc8b104fadb8cdef3ad29c31f (diff) | |
Merge release-20200422.0-11-g5e1e61f (automated)
Diffstat (limited to 'pkg/tcpip/transport/udp/endpoint.go')
| -rw-r--r-- | pkg/tcpip/transport/udp/endpoint.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go index edb54f0be..756ab913a 100644 --- a/pkg/tcpip/transport/udp/endpoint.go +++ b/pkg/tcpip/transport/udp/endpoint.go @@ -1250,8 +1250,8 @@ func (e *endpoint) Readiness(mask waiter.EventMask) waiter.EventMask { // endpoint. func (e *endpoint) HandlePacket(r *stack.Route, id stack.TransportEndpointID, pkt stack.PacketBuffer) { // Get the header then trim it from the view. - hdr := header.UDP(pkt.Data.First()) - if int(hdr.Length()) > pkt.Data.Size() { + hdr, ok := pkt.Data.PullUp(header.UDPMinimumSize) + if !ok || int(header.UDP(hdr).Length()) > pkt.Data.Size() { // Malformed packet. e.stack.Stats().UDP.MalformedPacketsReceived.Increment() e.stats.ReceiveErrors.MalformedPacketsReceived.Increment() @@ -1286,7 +1286,7 @@ func (e *endpoint) HandlePacket(r *stack.Route, id stack.TransportEndpointID, pk senderAddress: tcpip.FullAddress{ NIC: r.NICID(), Addr: id.RemoteAddress, - Port: hdr.SourcePort(), + Port: header.UDP(hdr).SourcePort(), }, } packet.data = pkt.Data |