security: prevent integer overflows in shape multiplication and quantization allocation#3583
Open
deezsecc wants to merge 1 commit into
Open
security: prevent integer overflows in shape multiplication and quantization allocation#3583deezsecc wants to merge 1 commit into
deezsecc wants to merge 1 commit into
Conversation
…ization allocation
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
This PR addresses the bug reported in #3582
Changes
memory_helpers.cc— Guard against shape dimension overflow<limits>include.element_countby each dimension, validates that the dimension is non-negative and that the multiplication would not exceedstd::numeric_limits<int>::max(). ReturnskTfLiteErrorimmediately if either check fails.micro_allocator.cc— Guard against quantization channel count overflow<limits>and<new>includes.TfLiteIntArray), validates thatchannelsis positive and thatsizeof(TfLiteIntArray) + channels * sizeof(int)would not overflowsize_t. ReturnskTfLiteErrorwith a diagnostic message if the check fails.Testing
Two new tests added to
micro_allocator_test.cc:TestTensorShapeIntegerOverflow— constructs a flatbuffer tensor with shape[65536, 65536](product overflowsint) and asserts thatInitializeTfLiteTensorFromFlatbufferreturnskTfLiteError.TestQuantizationChannelsIntegerOverflow— on 32-bit targets (sizeof(size_t) == 4), crafts a malformed flatbuffer with a fake channel count of0x3fffffff(triggersTfLiteIntArrayGetSizeInBytesoverflow) and asserts thatInitializeTfLiteTensorFromFlatbufferreturnskTfLiteError.BUG=#3582