diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-05-13 21:00:53 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-13 21:00:53 +0000 |
| commit | e1cfd3185c285f4dc69804210cc0d77ec582beb5 (patch) | |
| tree | 866c789fcc0f67ec0933e3cf88fed6628e85b6f6 /pkg/tcpip/network/internal | |
| parent | f4d9f967005fdf7995439f56839cbb4a7589ff6c (diff) | |
| parent | 84f04cc858644e9748a82f33b834a84c8b0fc934 (diff) | |
Merge release-20210510.0-27-g84f04cc85 (automated)
Diffstat (limited to 'pkg/tcpip/network/internal')
| -rw-r--r-- | pkg/tcpip/network/internal/fragmentation/reassembler.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/tcpip/network/internal/fragmentation/reassembler.go b/pkg/tcpip/network/internal/fragmentation/reassembler.go index 90075a70c..56b76a284 100644 --- a/pkg/tcpip/network/internal/fragmentation/reassembler.go +++ b/pkg/tcpip/network/internal/fragmentation/reassembler.go @@ -167,8 +167,7 @@ func (r *reassembler) process(first, last uint16, more bool, proto uint8, pkt *s resPkt := r.holes[0].pkt for i := 1; i < len(r.holes); i++ { - fragData := r.holes[i].pkt.Data() - resPkt.Data().ReadFromData(fragData, fragData.Size()) + stack.MergeFragment(resPkt, r.holes[i].pkt) } return resPkt, r.proto, true, memConsumed, nil } |