Add bounds checks for Type.index() in CopyTable and BinaryAnnotator#9125
Open
ganisai8202 wants to merge 1 commit into
Open
Add bounds checks for Type.index() in CopyTable and BinaryAnnotator#9125ganisai8202 wants to merge 1 commit into
ganisai8202 wants to merge 1 commit into
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
58044f1 to
79dddf7
Compare
This file contains hidden or 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
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.
Summary
Multiple sites in
CopyTable(src/reflection.cpp) andBinaryAnnotator(src/binary_annotator.cpp, src/binary_annotator.h) usefield->type()->index()as a direct index intoschema->objects()orschema->enums()without bounds checking.Vector::Get()only has a debug-onlyFLATBUFFERS_ASSERT, so in release builds (-DNDEBUG) an out-of-range index causes a wild-pointer dereference (SIGSEGV).This is reachable via
flatc --annotate, which loads raw.bfbsbytes (src/flatc.cpp:1050-1052) without going through the bounds-checkedParser::Deserializepath.VerifySchemaBuffer()does not validatetype.indexbounds, so it accepts the malicious schema.Fix
Add
GetObjectByIndex/GetEnumByIndexsafe accessor helpers (returnnullptron out-of-range index) and update each call site to check before dereference. The pattern follows the existing bounds check inBinaryAnnotator::IsValidUnionValue(binary_annotator.h:416).Scope
Sites fixed in this PR:
CopyTable(3 sites)IsInlineField,GetElementSize(2 sites)BuildTable,BuildStruct,BuildVector,BuildUnion(6 sites)Validation
-std=c++17 -O1 -DNDEBUG..bfbswithtype.index = 0x7FFFFFFF(objects size = 1) no longer causes SIGSEGV throughflatc --annotateafter this patch.