-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
gen/refactor: transform and misc related changes for improved transform support #12427
base: master
Are you sure you want to change the base?
Conversation
This commit makes the detection engine thread context available for transforms to use. The Lua transform requires this value. Issue: 2290
Issue: 2290 This commit extends the hash table logic with an alternate free function that provides the detection engine context. Users that wish to use the next functionality must use the HashListTableInitWithCtx function when initializing the hash table. Using this interface will result in the hash table "free with context" function (new) being used instead.
Issue: 2290 Defer freeing the keyword hash table until the engine context has been freed. This eliminates a double-free from occurring. For the unittests ONLY, clear the keyword_hash to prevent a double free attempt.
So transforms can access them through DetectEngineThreadCtx
git grep -A 1 -w InspectionBufferSetup shows numbers cases of the pattern: - InspectionBufferSetup - InspectionBufferApplyTransforms Refactor the implementations of those functions into InspectionBufferSetupAndApplyTransforms to reduce function call count. Issuer: 2290
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12427 +/- ##
=======================================
Coverage 80.63% 80.64%
=======================================
Files 918 920 +2
Lines 258696 258725 +29
=======================================
+ Hits 208598 208636 +38
+ Misses 50098 50089 -9
Flags with carried forward coverage won't be shown. Click here to find out more. |
Information: QA ran without warnings. Pipeline 24269 |
@@ -984,7 +986,7 @@ static void DetectBufferTypeFreeFunc(void *data) | |||
static int DetectBufferTypeInit(void) | |||
{ | |||
BUG_ON(g_buffer_type_hash); | |||
g_buffer_type_hash = HashListTableInit(256, DetectBufferTypeHashNameFunc, | |||
g_buffer_type_hash = HashListTableInitWithCtx(256, DetectBufferTypeHashNameFunc, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure I understand why in this global hash we'd free with de_ctx? That should only happen for per de_ctx hashes, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is necessary with the Luaxform so its free function can unregister the thread ctx
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it shows a problem with the original code. There should be no dependency on a de_ctx
in this global data structure. So if we need to free something using a de_ctx here, it means we're storing data in the wrong place.
Continuation of #12426
A set of changes from #12425 that improve transform support
Describe changes:
Updates:
Provide values to any of the below to override the defaults.
link to the pull request in the respective
_BRANCH
variable.SV_REPO=
SV_BRANCH=
SU_REPO=
SU_BRANCH=
LIBHTP_REPO=
LIBHTP_BRANCH=