pcre: creates a match structure per match run #6425
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
So that DetectPcrePayloadMatch is thread safe and does not rewrite a shared parse_regex.match structure
Codecov Report
@@ Coverage Diff @@
## master #6425 +/- ##
==========================================
- Coverage 76.92% 76.91% -0.01%
==========================================
Files 613 613
Lines 186677 186681 +4
==========================================
- Hits 143597 143589 -8
- Misses 43080 43092 +12
Flags with carried forward coverage won't be shown. Click here to find out more. |
| @@ -199,7 +200,8 @@ int DetectPcrePayloadMatch(DetectEngineThreadCtx *det_ctx, const Signature *s, | |||
| } | |||
|
|
|||
| /* run the actual pcre detection */ | |||
| ret = DetectPcreExec(det_ctx, pe, (char *)ptr, len, start_offset, 0); | |||
| pcre2_match_data *match = pcre2_match_data_create_from_pattern(pe->parse_regex.regex, NULL); | |||
There was a problem hiding this comment.
you can use thread specific data with DetectRegisterThreadCtxFuncs, DetectThreadCtxGetKeywordThreadCtx. See src/detect-lua.c for an example implementation.
There was a problem hiding this comment.
Thanks Victor.
I gathered from your answer that
- this was indeed one bug
- the performance impact could be avoided
|
Replaced by #6427 |
catenacyber
added a commit
to catenacyber/suricata
that referenced
this pull request
Nov 6, 2023
victorjulien
pushed a commit
to victorjulien/suricata
that referenced
this pull request
Nov 7, 2023
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.
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/4720
Describe changes:
pcre2_match_datafor each call ofDetectPcrePayloadMatchI am not sure this is the problem.
But if there are two threads which can call concurrently
DetectPcrePayloadMatchwith the sameDetectPcreData(ie SigMatchData context), that is indeed a problemTODO