Add bounds check on SkBuff::load_bytes
#1187
Open
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
✅ Deploy Preview for aya-rs-docs ready!Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify site configuration. |
|
Looks like voodoo to me, will let @alessandrod have a look. |
|
as per discord, can we add an integration test please |
dave-tucker
reviewed
Mar 3, 2025
| @@ -90,6 +90,10 @@ impl SkBuff { | |||
| let len = usize::try_from(self.len()).map_err(|core::num::TryFromIntError { .. }| -1)?; | |||
| let len = len.checked_sub(offset).ok_or(-1)?; | |||
| let len = len.min(dst.len()); | |||
| let in_bounds = check_bounds_signed(len as c_long, 0, dst.len() as c_long + 1); | |||
There was a problem hiding this comment.
This can be done without a let binding.
Suggested change
| let in_bounds = check_bounds_signed(len as c_long, 0, dst.len() as c_long + 1); | |
| if !check_bounds_signed(len as c_long, 0, dst.len() as c_long + 1) { | |
| return Err(-1); | |
| } |
Also why dst.len() as c_long + 1 - surely that's out of bounds?
|
@djahandarie, this pull request is now in conflict and requires a rebase. |
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.
There have been some reports on the Discord that people run into a verifier issue with use of
load_bytes:It seems to be that it thinks it's possible that the length could be zero. At first I tried resolving it with a
len !=0check but that didn't work. Adding.max(1)did work, but that's arguably not the right semantics as it should probably error if the program really passed in 0, not just arbitrarily read one byte.alessandrod told me about the existence of
check_bounds_signed, which I've used to add a check here. This seems to also work.This change is