Check stream-closed-on-reentry and drop packets with invalid sack blocks#279
Merged
jthomas43 merged 1 commit intoholepunchto:mainfrom Mar 22, 2026
Merged
Conversation
…cked and on_read(EOF) after send_ack(). check incoming sack blocks are within pkt.ack < start.start and sack.end < stream.seq
jthomas43
commented
Mar 20, 2026
| assert(bytes <= stream->writes_queued_bytes); | ||
| stream->writes_queued_bytes -= bytes; | ||
|
|
||
| if (cancelled) return; |
Contributor
Author
There was a problem hiding this comment.
no need to call on drain if we're closing.
jthomas43
commented
Mar 20, 2026
|
|
||
| on_bytes_acked(wbuf, pkt_len, false); | ||
| if (stream->status & UDX_STREAM_DEAD) { | ||
| deref_packet(pkt); |
Contributor
Author
There was a problem hiding this comment.
need to deref here since we unhook from the circular queue when processing the packet, it would be missed by the stream_close code
mafintosh
approved these changes
Mar 20, 2026
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
2 participants
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.
Check for potential stream-closed-on-reentry after potential on_drain in
on_bytes_acked()andon_read(EOF)aftersend_ack()Check that incoming sack blocks have a reasonable range: pkt.ack < sack.start and sack.end < stream.seq, and drop invalid packets.