detect/content: Consider distance in validation #6846
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
Ticket: 2982 This commit validates that the content usage in a rule will not exceed the dsize value. Values of distance that cause the right edge to be exceeded are considered an error and the signature will be rejected.
This commit replaces a SCMalloc/memset with SCCalloc
Codecov Report
@@ Coverage Diff @@
## master #6846 +/- ##
==========================================
- Coverage 77.70% 77.69% -0.02%
==========================================
Files 628 628
Lines 187247 187281 +34
==========================================
+ Hits 145503 145508 +5
- Misses 41744 41773 +29
Flags with carried forward coverage won't be shown. Click here to find out more. |
victorjulien
requested changes
Jan 25, 2022
| @@ -402,6 +400,17 @@ bool DetectContentPMATCHValidateCallback(const Signature *s) | |||
|
|
|||
| uint32_t max_right_edge = (uint32_t)max_right_edge_i; | |||
|
|
|||
| int min_dsize_required = SigParseMaxRequiredDsize(s); | |||
| if (min_dsize_required >= 0) { | |||
| SCLogNotice("min_dsize %d; max_right_edge %d", min_dsize_required, max_right_edge); | |||
|
ERROR: Invalid Signature config error in tlpr1_asan_cfg QA test ERROR: QA failed on tlpr1_asan_cfg. Pipeline 5887 |
|
Continued in #6939 |
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 #6838
This commit modifies the validation callback to include the distance
during validation.
Values of distance that cause the right edge to be exceeded are
considered an error and the signature will be rejected.
Link to redmine ticket: 2982
Describe changes:
Updates:
suricata-verify-pr: 673
#suricata-verify-repo:
#suricata-verify-branch:
#suricata-update-pr:
#suricata-update-repo:
#suricata-update-branch:
#libhtp-pr:
#libhtp-repo:
#libhtp-branch: