Use correct comparison in SACK reordering to avoid wrapping errors#55
Merged
gasbytes merged 1 commit intowolfSSL:masterfrom Mar 2, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes wrap-around bugs in TCP SACK block normalization by switching SACK block ordering/merging comparisons to use the stack’s wrap-aware TCP sequence comparison helpers, and adds regression tests to cover the wrap case.
Changes:
- Use
tcp_seq_lt()intcp_sort_sack_blocks()to sort SACK blocks with wrap-aware ordering. - Use
tcp_seq_lt()/tcp_seq_leq()intcp_merge_sack_blocks()to merge ranges correctly when sequence numbers wrap. - Add unit tests that validate sort/merge behavior across a wrap boundary and register them in the suite.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/wolfip.c | Updates SACK sort/merge logic to use wrap-aware TCP sequence comparisons to avoid incorrect ordering/merging near 32-bit wrap. |
| src/test/unit/unit.c | Adds and wires up unit tests that reproduce/guard the wrap-around ordering behavior for SACK sort/merge. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
gasbytes
approved these changes
Mar 2, 2026
Contributor
gasbytes
left a comment
There was a problem hiding this comment.
confirmed locally as usual with gh pr checkout, lgtm.
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.
Found via fenrir/145