Skip to content
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.

Sign up for GitHub

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

Jump to bottom

detect/multi-tenant: Eliminate crashes processing tenant config #9056

Closed
wants to merge 4 commits into from
Closed

detect/multi-tenant: Eliminate crashes processing tenant config #9056

wants to merge 4 commits into from

Conversation

jlucovsky
Copy link
Contributor

This PR eliminates crashes during parallel loading of tenant configurations by serializing processing of the .config files

  • reference.config
  • threshold.config
  • classification.config

Link to redmine ticket: 6047

Describe changes:

  • Serialize .config file loading
  • Use SCCalloc over SCMalloc in detect-engine.c

Provide values to any of the below to override the defaults.

To use a pull request use a branch name like pr/N where N is the pull request number.

SV_REPO=
SV_BRANCH=
SU_REPO=
SU_BRANCH=
LIBHTP_REPO=
LIBHTP_BRANCH=

@jlucovsky
detect/multi-tenant: Make tenant_id 32 bits everywhere
aa2e723 
Issue: 6047

This commit ensures that the tenant id is contained in a unsigned 32 bit
container.
@jlucovsky
detect/config: Serialize config file processing
633ef85 
Issue: 6047

This commit serializes processing of individual .config file processing.
This is of little consequence when multi-tenancy is not in use.

When multiple tenants have been configured, serialization will ensure
parallel loading of configuration/rules doesn't concurrently use shared
pcre2 constructs.
@jlucovsky
detect/alloc: Use SCCalloc instead of SCMalloc
42966b3 
This commit changes memory allocations to SCCalloc for clarity.
@jlucovsky
detect/cleanup: Minor cleanups
4a700f4 
Move declarations closer to usage.
@suricata-qa
Copy link

WARNING:

field baseline test %
build_asan

Pipeline 14760

@jlucovsky jlucovsky mentioned this pull request Jun 22, 2023
Closed
@jlucovsky
Copy link
Contributor Author

Continued in #9060

@jlucovsky jlucovsky closed this Jun 22, 2023
@jlucovsky jlucovsky deleted the 6047/1 branch July 18, 2023 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@victorjulien victorjulien Awaiting requested review from victorjulien victorjulien is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jlucovsky @suricata-qa