Fix out-of-bounds read in NDP layers parsed from a truncated ICMPv6 message#2192
Open
vsaraikin wants to merge 1 commit into
Open
Fix out-of-bounds read in NDP layers parsed from a truncated ICMPv6 message#2192vsaraikin wants to merge 1 commit into
vsaraikin wants to merge 1 commit into
Conversation
vsaraikin
marked this pull request as ready for review
July 25, 2026 17:31
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
parseIcmpV6Layerbuilds an NDP neighbor solicitation/advertisement layer for ICMPv6 types 135/136 after only checkingdataLen >= sizeof(icmpv6hdr)(4 bytes), but both NDP headers are 24 bytes. So a 4-23 byte type 135/136 message still gets parsed as NDP, andgetTargetIP()reads the 16-byte target address at offset 8 past the end of the buffer. The option walk hits the same thing:getHeaderLen() - getNdpHeaderLen()isdataLen - 24, which underflows for a short packet. Both are reachable fromtoString().Fix adds
isDataValid()to the two NDP layers (require the full 24 bytes) and falls back to a plainIcmpV6Layerwhen the message is too short, same as the GtpV2 guard in #2181.Testing
Added truncated type 135/136 messages to
IcmpV6ParsingTest(rejected byisDataValid, full 24-byte headers still accepted). icmpv6 tests pass.