GH-49884: [C++] Fix integer overflow in BufferBuilder reachable from JSON parsing#49883
Open
metsw24-max wants to merge 2 commits intoapache:mainfrom
Open
GH-49884: [C++] Fix integer overflow in BufferBuilder reachable from JSON parsing#49883metsw24-max wants to merge 2 commits intoapache:mainfrom
metsw24-max wants to merge 2 commits intoapache:mainfrom
Conversation
|
Thanks for opening a pull request! If this is not a minor PR. Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose Opening GitHub issues ahead of time contributes to the Openness of the Apache Arrow project. Then could you also rename the pull request title in the following format? or See also: |
|
|
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.
Rationale for this change
BufferBuilderandTypedBufferBuilderperform size calculations that are reachable from JSON parsing of untrusted input. These calculations previously used unchecked integer arithmetic (e.g.,size_ + additional_bytes,num_elements * sizeof(T)), which can overflow.Since the JSON parser constructs arrays, strings, and offsets based on input data, an attacker can influence these values. Overflow in these calculations can result in incorrect buffer sizing and unsafe memory operations.
What changes are included in this PR?
Added overflow-safe arithmetic using
internal::AddWithOverflowandinternal::MultiplyWithOverflowfor:size_ + additional_bytesnum_elements * sizeof(T)Added validation for negative inputs across:
AppendReserveResizeAdvanceFinishWithLengthHardened
GrowByFactorto prevent overflow when doubling capacityUpdated
TypedBufferBuilderto safely compute byte sizes from element countsAdded regression tests covering:
Are these changes tested?
Yes.
New tests were added to:
BufferBuilderandTypedBufferBuilderInvalid,CapacityError) instead of undefined behaviorAre there any user-facing changes?
No functional changes for valid inputs.
Invalid inputs (e.g., negative sizes or values causing overflow) that previously resulted in undefined behavior are now explicitly rejected with clear error statuses.
This PR contains a "Critical Fix".
Unchecked integer arithmetic in buffer size calculations could overflow when processing untrusted JSON input. This may result in under-allocation of buffers followed by writes of larger logical sizes, leading to potential out-of-bounds memory writes and undefined behavior.
This patch ensures all such arithmetic is validated, preventing incorrect buffer sizing and eliminating this class of memory safety issues.