Harden integer ranges in parallel BC compression - #744
Draft
Roland Shum (ShumWengSang) wants to merge 3 commits into
Draft
Roland Shum (ShumWengSang) wants to merge 3 commits into
Roland Shum (ShumWengSang) wants to merge 3 commits into
Conversation
|
|
||
| // Refactored version of loop to support parallel independance | ||
| const size_t nBlocks = std::max<size_t>(1, (image.width + 3) / 4) * std::max<size_t>(1, (image.height + 3) / 4); | ||
| const size_t nbWidthBlocks = std::max<size_t>(1, (image.width >> 2) + ((image.width & 3) ? 1 : 0)); |
Collaborator
There was a problem hiding this comment.
I think a simpler solution would be to promote to uint64_t here and then cast it back after the check.
| // The dimension check keeps the rounded counts and their product within uint64_t. | ||
| const uint64_t nbWidthBlocks = std::max<uint64_t>(1, (uint64_t(image.width) + 3) / 4); | ||
| const uint64_t nbHeightBlocks = std::max<uint64_t>(1, (uint64_t(image.height) + 3) / 4); | ||
| const uint64_t nBlocks = nbWidthBlocks * nbHeightBlocks; |
Collaborator
There was a problem hiding this comment.
Most of this is great. end it with:
const uint64_t blockCount = nbWidthBlocks * nbHeightBlocks;
if (blockCount > INT32_MAX)
{
return HRESULT_E_ARITHMETIC_OVERFLOW;
}
auto nBlocks = static_cast<size_t>(nBlocks);
That way for 32-bit builds, the loop stick with 32-bit loop values.
| || nbWidthBlocks > static_cast<size_t>(INT32_MAX) / nbHeightBlocks) | ||
| // their input dimensions before calculating the block count. | ||
| if (image.width > static_cast<size_t>(INT32_MAX) || image.height > static_cast<size_t>(INT32_MAX)) | ||
| { |
Collaborator
There was a problem hiding this comment.
You might want to add a comment here:
// Direct3D texture size limits are below INT32_MAX, so this should not pose a problem in practice.
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
Add integer-range validation to the existing parallel BC compression iterator:
uint64_t, calculate the rounded block extents and their product, then check the signed loop-count limit before narrowing.This follows the review suggestion to use wider intermediate arithmetic and cast back after checking the result. The dimension guard bounds the additions and product, as well as the later signed pixel-coordinate calculations.
This is a source-only, post-allocation arithmetic-hardening change. It does not move validation ahead of destination allocation, change the serial compression path, or change progress-callback behavior. Parallel inputs outside the helper's existing signed dimension/block-count range return an arithmetic-overflow error.
Validation
git diff --checkpass.Limits
The arithmetic model is not an end-to-end large-image reproduction. No valid file-input reachability or large-allocation mitigation is claimed. No new maintained test-suite regression is included; the local ordinary-image and arithmetic harnesses are validation evidence only.