UPSTREAM PR #27102: Fix OOM in packed field decoders due to integer overflow in length validation#157
Open
loci-dev wants to merge 2 commits into
Open
UPSTREAM PR #27102: Fix OOM in packed field decoders due to integer overflow in length validation#157loci-dev wants to merge 2 commits into
loci-dev wants to merge 2 commits into
Conversation
|
No meaningful performance changes were detected across 10164 analyzed functions in the following binaries: build.protoc-stable. 💬 Questions? Tag @loci-dev |
f292971 to
1fdfb93
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.
Note
Source pull request: protocolbuffers/protobuf#27102
Problem
Parsing a crafted protobuf message with a packed repeated field whose declared
byte length is close to
Integer.MAX_VALUEcausesOutOfMemoryErrorandcrashes the JVM.
The root cause is an integer overflow in ArrayDecoders: the bounds check
fieldLimit > data.lengthruns after computingfieldLimit = position + packedDataByteSize, which wraps to a negative valuewhen
packedDataByteSizeis large. A negativefieldLimitalways passes the> data.lengthcomparison, allowing ensureCapacity() to receive theunchecked byte size. For decodePackedFixed32List, this allocates a
536-million-element
int[](~2 GB) from a 7-byte input.Impact
any JVM heap size. The allocation happens inside the protobuf parser before
application code runs.
fixed32, fixed64, float, double, varint32, varint64, bool, sint32, sint64.
added to fixed-width decoders). The overflow in
fieldLimitcomputationexists in earlier versions as well but was less exploitable without the
pre-allocation.
Fix
Replace the post-addition bounds check with an overflow-safe pre-addition
validation in all 9 packed decoders:
The subtraction
data.length - positioncannot underflow becausepositionis always a valid index into
dataat this point. This rejects both negativevarint lengths and lengths that exceed the remaining buffer, before any
addition or allocation occurs.
Testing
Added PackedFixed32OverflowTest with 9 test methods (one per packed decoder
type). Each crafts a minimal payload with
length = Integer.MAX_VALUEandasserts
InvalidProtocolBufferExceptionis thrown. Without the fix, thesetests crash with
OutOfMemoryError.