Batch backports to master-5.0.x #6386
Closed
Conversation
This file contains 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
(cherry picked from commit a17da83)
When tracking data track the size of the blocks so that in case of gaps we can still know how much data we hold. (cherry picked from commit be1baa8)
For size limit checks consider only available data at the stream start and before any GAPS. The old check would consider too much data if there were temporary gaps, like when a data packet was in-window but (far) ahead of the expected segment. (cherry picked from commit 7a114e5)
To take TCP window into account And to actually bail out if we received too much data where the limit is configured by stream.reassembly.depth (cherry picked from commit f77b027)
(cherry picked from commit b08a7b9)
(cherry picked from commit 7fa3e8d)
So that CI does not fail, if suricata PR got upgraded in a new version, but S-V PR did not get upgraded, and S-V changed in master (cherry picked from commit 3e81d20)
This was referenced Sep 17, 2021
|
Continued in #6388 |
jmtaylor90
added a commit
to jmtaylor90/suricata
that referenced
this pull request
Oct 11, 2023
Ticket: OISF#6386 Signed-off-by: jason taylor <[email protected]>
3 tasks
victorjulien
pushed a commit
to victorjulien/suricata
that referenced
this pull request
Oct 16, 2023
Ticket: OISF#6386 Signed-off-by: jason taylor <[email protected]>
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.
Continuation of #6384
This PR contains backports for the issues listed below
Link to redmine ticket:
Describe changes:
master(2 commits)#suricata-verify-pr:
#suricata-verify-repo:
#suricata-verify-branch:
#suricata-update-pr:
#suricata-update-repo:
#suricata-update-branch:
#libhtp-pr:
#libhtp-repo:
#libhtp-branch: