Fix ICMP reply decoding robustness#53
Merged
Merged
Conversation
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.
This fixes two robustness issues in the reply-receiving loop. First, when an incoming IPv4 packet fails to decode (malformed, truncated, or unrelated ICMP traffic delivered on a RAW socket), the loop now skips it and keeps waiting for our own reply instead of aborting the entire ping with an error. This previously caused spurious failures, particularly on Windows where RAW sockets are the default and receive all ICMP traffic on the host.
Second,
EchoReply::decodeonly checked that the buffer was at leastHEADER_SIZE(8) bytes before slicing out the 24-byte payload at[8..32], so any buffer between 8 and 31 bytes would panic on an out-of-bounds index. The length check now requires the full header plus payload, and the magic number is replaced with a newPAYLOAD_SIZEconstant. The now-unusedError::DecodeV4Errorvariant is removed as well; note this is a breaking change to the publicErrorenum.