PYTHON-4305 Fix bson size check #1564
Merged
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
ShaneHarvey
commented
Mar 27, 2024
| @@ -2311,7 +2312,8 @@ static PyObject* get_value(PyObject* self, PyObject* name, const char* buffer, | |||
| memcpy(&code_size, buffer + *position, 4); | |||
| code_size = BSON_UINT32_FROM_LE(code_size); | |||
| /* code_w_scope length + code length + code + scope length */ | |||
| if (!code_size || max < code_size || max < 4 + 4 + code_size + 4) { | |||
| len = 4 + 4 + code_size + 4; | |||
| if (!code_size || max < code_size || max < len || len < code_size) { | |||
There was a problem hiding this comment.
len < code_size catches when len overflows.
| /* code length + code + scope length + scope */ | ||
| if ((4 + code_size + 4 + scope_size) != c_w_s_size) { | ||
| len = 4 + 4 + code_size + scope_size; | ||
| if (scope_size < BSON_MIN_SIZE || len != c_w_s_size || len < scope_size) { |
There was a problem hiding this comment.
len < scope_size catches when len overflows.
blink1073
pushed a commit
that referenced
this pull request
Mar 27, 2024
(cherry picked from commit 372b5d6)
|
This is related to CVE-2024-5629 |
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.
https://jira.mongodb.org/browse/PYTHON-4305