Adding unsigned int sanitization and SCRUTINICE fixes #2103
+40
−37
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2103 +/- ##
==========================================
- Coverage 78.76% 78.74% -0.02%
==========================================
Files 598 598
Lines 103656 103656
Branches 14720 14719 -1
==========================================
- Hits 81641 81624 -17
- Misses 21363 21379 +16
- Partials 652 653 +1 ☔ View full report in Codecov by Sentry. |
justsmth
reviewed
Jan 10, 2025
Comment on lines
+88
to
+94
| long callback_ret = bio->callback_ex(bio, oper, buf, len, 0, 0L, ret, &processed); | ||
| if (callback_ret <= INT_MAX) { | ||
| ret = (int)callback_ret; | ||
| if (ret > 0) { | ||
| // BIO will only read int |len| bytes so this is a safe cast | ||
| ret = (int)processed; | ||
| } |
There was a problem hiding this comment.
callback_retmight also be less thanINT_MIN. (We do a similar check on line 139 below.)
if (callback_ret <= INT_MAX && callback_ret >= INT_MIN) {
ret = (int)callback_ret;
- If
callback_retis not in this range we're simply not setting it (i.e., there's noelseblock), but that doesn't seem right. What value do we set it to? Maybe-1?
Comment on lines
+139
to
+140
| if (ret <= 0 && ret >= INT_MIN) { | ||
| return (int)ret; |
There was a problem hiding this comment.
- If
ret <= 0, the function should return even ifret < INT_MIN. Maybe returnINT_MIN?
if (ret <= 0) {
if (ret >= INT_MIN) {
return (int)ret;
} else {
return INT_MIN;
}
}
- Ditto for the numerous similar changes below in this file.
| @@ -448,7 +448,7 @@ BIGNUM *BN_mpi2bn(const uint8_t *in, size_t len, BIGNUM *out) { | |||
| } | |||
| out->neg = ((*in) & 0x80) != 0; | |||
| if (out->neg) { | |||
| BN_clear_bit(out, BN_num_bits(out) - 1); | |||
| BN_clear_bit(out, (int)BN_num_bits(out) - 1); | |||
There was a problem hiding this comment.
NP: Should we verify that (BN_num_bits(out) - 1) <= INT_MAX?
| @@ -85,12 +85,10 @@ void CRYPTO_cbc128_encrypt(const uint8_t *in, uint8_t *out, size_t len, | |||
| } | |||
| (*block)(out, out, key); | |||
| iv = out; | |||
| // This will always be true as a result of the first while loop | |||
There was a problem hiding this comment.
Then we should instead change the while (len) above to an if (len > 0) and then there's no reason to break.
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.
Issues:
Description of changes:
Call-outs:
Point out areas that need special attention or support during the review process. Discuss architecture or design changes.
Testing:
How is this change tested (unit tests, fuzz tests, etc.)? Are there any testing steps to be verified by the reviewer?
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.