Validate texture copy ranges earlier to prevent integer overflow #3090
Conversation
This file contains 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
nical
changed the title
cwfitzgerald
requested changes
Oct 12, 2022
validate_texture_copy_range has a number of important checks on sizes that we want to make as early as possible to prevent integer overflows in other places such as transfer::extract_texture_selector which computes copy_texture.origin.z + copy_size.depth_or_array_layers (overflow found by fuzzers as always). The fix is to call validate_texture_copy_range earlier, in particular before extract_texture_selector. Unfortunately it led to more code churn than I would have liked. Thankfully it is mechanical and simple: Rather than getting the texture reference from Tracker::set_single, we grab it earlier (for validation) and pass it to set_single instead of the texture guard. As a bonus we are looking texture texture up less often than we used to.
nical
force-pushed
the
transfer-valid-early
branch
from
b45f72e to
4084d8a
Compare
Codecov Report
@@ Coverage Diff @@
## master #3090 +/- ##
===========================================
- Coverage 65.41% 47.14% -18.27%
===========================================
Files 82 82
Lines 39455 39436 -19
===========================================
- Hits 25809 18592 -7217
- Misses 13646 20844 +7198
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
cwfitzgerald
approved these changes
Dec 1, 2022
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.
Checklist
cargo clippy.Connections
https://bugzilla.mozilla.org/show_bug.cgi?id=1791806
Description
validate_texture_copy_rangehas a number of important checks on sizes that we want to make as early as possible to prevent integer overflows in other places such astransfer::extract_texture_selectorwhich computescopy_texture.origin.z + copy_size.depth_or_array_layers(overflow found by a fuzzer, as always).The fix is to call validate_texture_copy_range earlier, in particular before extract_texture_selector.
Unfortunately it led to more code churn than I would have liked. Thankfully it is mechanical and simple: Rather than getting the texture reference from
Tracker::set_single, we grab it earlier (for validation) and pass it toset_singleinstead of the texture guard.As a bonus we are looking texture texture up less often than we used to, and we do all of the validation before starting to transition some states which sounds safer to me.
Testing
I did actually add a test this time around!