Repository navigation
net: reject oversized messages instead of truncating the TCP length prefix - #4144
Merged
Merged
Conversation
…refix TcpStream wrote `buffer.len() as u16` as the 2-byte length prefix, so a message longer than 65535 bytes got a wrapped length followed by the full payload. The peer then splits the stream at the wrong place and parses the rest of the payload as further messages. Return an InvalidData error for such messages instead, the same way the QUIC stream already rejects them with u16::try_from.
b84330808
requested review from
bluejekyll,
cpu,
divergentdave,
djc and
marcus0x62
as code owners
November 4, 2026 16:09
djc
approved these changes
Nov 4, 2026
djc
left a comment
Member
There was a problem hiding this comment.
LGTM, thanks.
Do you want to backport this to the release/0.26 branch?
djc
enabled auto-merge
November 4, 2026 16:12
divergentdave
approved these changes
Nov 4, 2026
Contributor
Author
|
Sure, thanks! Backport is up against |
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.
TcpStreamwrites the 2-byte length prefix asbuffer.len() as u16, so a message longer than 65535 bytes gets a wrapped length followed by the full payload, and the peer splits the stream at the wrong place and reads the rest as further messages (noted in #351: "TcpStream will blindly truncate the message").Hickory's own encoder caps messages at
u16::MAX, so this mostly matters for callers passing raw bytes viaSerialMessage. Such a message now yields anInvalidDataerror from the stream, like the existing mismatched-peer check, and matchesQuicStream::send_bytes, which already usesu16::try_from. Added a test; without the fix it times out because the truncated frame is written.