diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 20:31:45 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 20:31:45 +0000 |
| commit | 85787349afad0ddb9252a3a474c0d4c2b8520492 (patch) | |
| tree | 83946552afc444e2f34676662ba2b0da79af21ac /pkg | |
| parent | 39b186c9816c3898277ac96fd09979f678b6172d (diff) | |
| parent | 51913ba400ccff88be58ed12ac3f393258629a50 (diff) | |
Merge release-20200928.0-105-g51913ba40 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/tcpip/header/icmpv6.go | 5 | ||||
| -rw-r--r-- | pkg/tcpip/network/ipv6/icmp.go | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkg/tcpip/header/icmpv6.go b/pkg/tcpip/header/icmpv6.go index 6be31beeb..4303fc5d5 100644 --- a/pkg/tcpip/header/icmpv6.go +++ b/pkg/tcpip/header/icmpv6.go @@ -49,11 +49,6 @@ const ( // neighbor advertisement packet. ICMPv6NeighborAdvertMinimumSize = ICMPv6HeaderSize + NDPNAMinimumSize - // ICMPv6NeighborAdvertSize is size of a neighbor advertisement - // including the NDP Target Link Layer option for an Ethernet - // address. - ICMPv6NeighborAdvertSize = ICMPv6HeaderSize + NDPNAMinimumSize + NDPLinkLayerAddressSize - // ICMPv6EchoMinimumSize is the minimum size of a valid echo packet. ICMPv6EchoMinimumSize = 8 diff --git a/pkg/tcpip/network/ipv6/icmp.go b/pkg/tcpip/network/ipv6/icmp.go index a6fc9d125..a454f6c34 100644 --- a/pkg/tcpip/network/ipv6/icmp.go +++ b/pkg/tcpip/network/ipv6/icmp.go @@ -361,7 +361,7 @@ func (e *endpoint) handleICMP(r *stack.Route, pkt *stack.PacketBuffer, hasFragme case header.ICMPv6NeighborAdvert: received.NeighborAdvert.Increment() - if !isNDPValid() || pkt.Data.Size() < header.ICMPv6NeighborAdvertSize { + if !isNDPValid() || pkt.Data.Size() < header.ICMPv6NeighborAdvertMinimumSize { received.Invalid.Increment() return } |