Improve type safety and bounds checking in EVP cipher ctrl handlers#3034
Merged
Improve type safety and bounds checking in EVP cipher ctrl handlers#3034
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3034 +/- ##
==========================================
- Coverage 78.37% 78.37% -0.01%
==========================================
Files 689 689
Lines 121148 121150 +2
Branches 16973 16973
==========================================
- Hits 94948 94946 -2
- Misses 25302 25308 +6
+ Partials 898 896 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
torben-hansen
approved these changes
Feb 25, 2026
sgmenda
approved these changes
Mar 6, 2026
WillChilds-Klein
pushed a commit
to WillChilds-Klein/aws-lc
that referenced
this pull request
Mar 11, 2026
…ws#3034) ### Description of changes: Fixes minor correctness and safety issues in the AES-GCM and AES-CCM EVP cipher ctrl handlers: - **`e_aes.c` (`EVP_CTRL_GCM_SET_IV_INV`):** Added bounds validation for `arg` (`arg <= 0 || arg > gctx->ivlen`). The companion handler `EVP_CTRL_GCM_IV_GEN` already validates `arg` before the same `gctx->iv + gctx->ivlen - arg` pointer arithmetic, but `SET_IV_INV` did not, allowing potential out-of-bounds access from a misuse of the API. - **`e_aesccm.c`** - **`EVP_CTRL_GET_IVLEN`:** The handler wrote through a `uint32_t *` cast, but the caller in `EVP_CIPHER_CTX_iv_length` passes an `int *`. This is a strict aliasing violation. Changed to `*(int *)ptr` to match the caller and the GCM handler's convention. - **`CCM_L_TO_NONCE_LEN` macro:** Added parentheses around the macro parameter to follow standard C macro hygiene. ### Call-outs: The `uint32_t *` vs `int *` mismatch is undefined behavior under C strict aliasing rules, though it is unlikely to cause issues in practice since both types are 32 bits on almost all platforms. The other two changes are defensive hardening. ### Testing: Existing tests cover these code paths. No behavioral change is expected for valid inputs. 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. Co-authored-by: Sanketh Menda <sgmenda@amazon.com>
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.
Description of changes:
Fixes minor correctness and safety issues in the AES-GCM and AES-CCM EVP cipher ctrl handlers:
e_aes.c(EVP_CTRL_GCM_SET_IV_INV): Added bounds validation forarg(arg <= 0 || arg > gctx->ivlen). The companion handlerEVP_CTRL_GCM_IV_GENalready validatesargbefore the samegctx->iv + gctx->ivlen - argpointer arithmetic, butSET_IV_INVdid not, allowing potential out-of-bounds access from a misuse of the API.e_aesccm.cEVP_CTRL_GET_IVLEN: The handler wrote through auint32_t *cast, but the caller inEVP_CIPHER_CTX_iv_lengthpasses anint *. This is a strict aliasing violation. Changed to*(int *)ptrto match the caller and the GCM handler's convention.CCM_L_TO_NONCE_LENmacro: Added parentheses around the macro parameter to follow standard C macro hygiene.Call-outs:
The
uint32_t *vsint *mismatch is undefined behavior under C strict aliasing rules, though it is unlikely to cause issues in practice since both types are 32 bits on almost all platforms. The other two changes are defensive hardening.Testing:
Existing tests cover these code paths. No behavioral change is expected for valid inputs.
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.