diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-20 19:09:52 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-20 19:09:52 +0000 |
| commit | 94868a1eee1c7ebb8fa2045799f47a501ad34baf (patch) | |
| tree | c64d95a029142e7f351d93edb8bfd42e1dd0aadc /pkg/tcpip/network/ipv4 | |
| parent | 931605e111a26230804569f960fd39dc279cd435 (diff) | |
| parent | 7ca62b9daa366ac2b3297f07de0ac601a2cca6bb (diff) | |
Merge release-20200810.0-72-g7ca62b9da (automated)
Diffstat (limited to 'pkg/tcpip/network/ipv4')
| -rw-r--r-- | pkg/tcpip/network/ipv4/ipv4.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/tcpip/network/ipv4/ipv4.go b/pkg/tcpip/network/ipv4/ipv4.go index 79872ec9a..63ffb3660 100644 --- a/pkg/tcpip/network/ipv4/ipv4.go +++ b/pkg/tcpip/network/ipv4/ipv4.go @@ -415,18 +415,20 @@ func (e *endpoint) HandlePacket(r *stack.Route, pkt *stack.PacketBuffer) { } var ready bool var err error - pkt.Data, ready, err = e.protocol.fragmentation.Process( + proto := h.Protocol() + pkt.Data, _, ready, err = e.protocol.fragmentation.Process( // As per RFC 791 section 2.3, the identification value is unique // for a source-destination pair and protocol. fragmentation.FragmentID{ Source: h.SourceAddress(), Destination: h.DestinationAddress(), ID: uint32(h.ID()), - Protocol: h.Protocol(), + Protocol: proto, }, h.FragmentOffset(), last, h.More(), + proto, pkt.Data, ) if err != nil { |