next/1468/80x/20260826/v1 - #16123
Merged
victorjulien merged 13 commits intoAug 27, 2026
Merged
Conversation
Mostly meant to help unittests and fuzz targets alloc the storage correctly. (cherry picked from commit ad1459d)
(cherry picked from commit 730ff50)
Seed value will have to be used by the caller's hash function. (cherry picked from commit b742d58)
Use for IPv6 in the main hash. Update IPv4 thread cache to also use a seed. For this the thread initialization is done at thread init instead on the first packet. The thread ctx is no longer stored in a thread_local, but instead uses the thread storage API to store in the ThreadVars. This way it will stay active during rule reloads as well. Ticket: OISF#8617. (cherry picked from commit c27868a)
(cherry picked from commit f67dadc)
Can get called multiple times in the multi-tenancy case. (cherry picked from commit cefee13)
Use new allocator to properly set up thread storage. (cherry picked from commit 9e82ff8)
Fedora 42 is EOL.
Mapping an app-layer progress state to its generic request-/response- hook alias was hardcoded in multiple places. This commit adds a wrapper to unify it to a single function. It returns the config-form (hyphenated) name, or NULL for an intermediate state. Ticket: 8770 (cherry picked from commit 1aa0259)
Every hook has a built-in default policy, but expressing anything other than the built-in meant naming each hook explicitly. This commit adds a `default-policy` setting that covers all hooks below it. For any hook the most specific setting present wins. Ticket: 8770 (cherry picked from commit 0aaa80d)
Validate the resolved scope against the class of hook it is being applied to and fail at startup if it does not fit. Ticket: 8770 (cherry picked from commit 092ae27)
Ticket: 8678 In FilePruneFile() `window * 3` was computed in uint32_t arithmetic. The guard exists to ensure `file->size > window`, so on wrap around `file->size - window` underflows and content_inspected is set to a bogus value, breaking file inspection. Make window uint64_t so the multiplication cannot wrap. (cherry picked from commit f3910d5)
Ticket: 8678 With an inspect window of 0xAAAAAAAB the `window * 3` guard wrapped to 1 in uint32_t arithmetic, so it passed for a 64 byte file and content_inspected was set to `file->size - window`, an underflow. (cherry picked from commit 8e551f2)
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main-8.0.x #16123 +/- ##
==============================================
+ Coverage 81.71% 81.73% +0.02%
==============================================
Files 1016 1017 +1
Lines 277201 277278 +77
==============================================
+ Hits 226509 226628 +119
+ Misses 50692 50650 -42
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
Information: QA ran without warnings. Pipeline = 33396 |
This was referenced Aug 27, 2026
Closed
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
4 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.
Staging:
SV_BRANCH=OISF/suricata-verify#3325