Repository navigation
Fix 32-bit zstdmt round buffer size overflow (memory OOB) - #4948
Open
kevinjzhang wants to merge 1 commit into
Open
kevinjzhang wants to merge 1 commit into
kevinjzhang wants to merge 1 commit into
Conversation
On 32-bit builds, ZSTDMT_initCStream_internal() computed the round buffer size in size_t. The total can reach or exceed 4 GiB and wrap: - windowLog 30 with btultra2 and LDM disabled makes the overlap 1 GiB, which raises the job size to 1 GiB after the job size cap is applied. The 4 GiB total wraps to 0, the allocation is skipped, and the first streaming copy writes through a NULL buffer. - Many workers with large jobs wrap to a smaller non-zero size, so the buffer is allocated but is too small for the configuration. Compute the slack/section totals in 64 bits and reject the configuration with memory_allocation when the total exceeds SIZE_MAX, before allocating. Add a 32-bit-only fuzzer regression test that expects both cases to fail cleanly with memory_allocation.
This branch has not been deployed
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.
On 32-bit builds,
ZSTDMT_initCStream_internal()computed the round buffer size insize_t. The total can reach or exceed 4 GiB and wrap.Instead, compute the slack/section totals in 64 bits and reject the configuration with
memory_allocationwhen the total exceedsSIZE_MAX, before allocating.Add a 32-bit-only fuzzer regression test that expects both cases to fail cleanly with
memory_allocation, which prior to the fix crashes.Test plan: the new
fuzzertest (oversized round buffer must fail cleanly on 32-bit) is a no-op on 64-bit builds;fuzzerpasses there.