Validate source map source indices#496
Open
VoltVoks wants to merge 1 commit into
Open
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. |
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.
Fixes #489.
ForEachVLQSegment()accumulates source-file deltas from attacker-controlled source-map mappings and then uses the result to index thesourcesvector without validating the index. A malformed source map can therefore drive an out-of-range vector read while Bloaty processes compile-unit or inline source-map data.This change validates the accumulated source-file index before looking up the source name and rejects negative or out-of-range values. The source-file accumulator is also widened to avoid wrapping before the bounds check.
I added a wasm source-map regression test using the malformed mapping from the issue:
Instead of indexing outside
sources, Bloaty now reports:Local verification:
cmake --build build-asan --target bloaty -j2 python3 /usr/bin/lit -sv build-asan/tests \ --param bloaty=build-asan/bloaty \ --filter sourcemap_invalid_source_index python3 /usr/bin/lit -sv build-asan/tests \ --param bloaty=build-asan/bloaty \ --filter 'wasm/sourcemap' python3 /usr/bin/lit -sv build-asan/tests \ --param bloaty=build-asan/bloaty git diff --check HEAD~1..HEADResults:
Before/after repro:
source map source file index out of range.