detect/bsize: Validate against content buffer when available
#4997
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
This commit updates the bsize documentation 1. Describe what happens when "content" immediately precedes "bsize" 2. Include the operators and 3. Include examples using the operators.
This commit causes the signature to be invalid if a content keyword immediately precedes bsize and the bsize value is incompatible with the content length.
This commit adds test cases that validate behavior when "content" immediately precedes "bsize".
victorjulien
reviewed
Jun 1, 2020
|
|
||
| static bool DetectBsizeCheckContent(const SigMatch *sm, const DetectBsizeData *bsz) | ||
| { | ||
| uint16_t bytes_required; |
There was a problem hiding this comment.
if none of the members of the list are content the error message will use this uninitialized variable.
There was a problem hiding this comment.
also: the error won't make sense at all in this case
victorjulien
requested changes
Jun 1, 2020
|
|
||
| static bool DetectBsizeCheckContent(const SigMatch *sm, const DetectBsizeData *bsz) | ||
| { | ||
| uint16_t bytes_required; |
There was a problem hiding this comment.
also: the error won't make sense at all in this case
|
Continued in #5014 |
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 #4991
This PR adds additional validation when using the
bsizekeyword. If a one or morecontentkeywords immediately precedesbsize, then thebsizevalue is checked against each to see if a match is possible using the operation (=, <, >, <>) and the value.An error is raised if
bsizevalue prevents a match, e.g., the content length exceeds thebsizevalue. Thebsizeoperation and values are used to do the evaluation.Link to redmine ticket: 3682
Describe changes:
offsetvalue when validating bsize value.Companion Suricata PR #233