ICP: Fix out of bounds write #9660
Merged
Conversation
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
If gcm_mode_encrypt_contiguous_blocks() is called more than once in succession, with the accumulated lengths being less than blocksize, ctx->copy_to will be incorrectly advanced. Later, if out is NULL, the bcopy at line 114 will overflow ctx->gcm_copy_to since ctx->gcm_remainder_len is larger than the ctx->gcm_copy_to buffer can hold. The fix is to set ctx->copy_to only if it's not already set. For ZoL the issue may be academic, since in all my testing I wasn't able to hit neither of both conditions needed to trigger it, but other consumers can easily do so. Signed-off-by: Attila Fülöp <[email protected]>
12 tasks
behlendorf
reviewed
Dec 2, 2019
Codecov Report
@@ Coverage Diff @@
## master #9660 +/- ##
==========================================
+ Coverage 79.32% 79.34% +0.01%
==========================================
Files 418 418
Lines 123544 123544
==========================================
+ Hits 98003 98026 +23
+ Misses 25541 25518 -23
Continue to review full report at Codecov.
|
|
With unmodified master |
tcaputi
approved these changes
Dec 3, 2019
|
Right, I already sent a mail to illumos-devel. Let's see if someone chimes in. |
|
Illumos issue 12048. |
behlendorf
approved these changes
Dec 3, 2019
behlendorf
added
Status: Accepted
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.
Motivation and Context
Bug fix.
Description
If
gcm_mode_encrypt_contiguous_blocks()is called more than once in succession, with the accumulated lengths being less thanblocksize,ctx->copy_towill be incorrectly advanced. Later, if out is NULL, bcopy() will overflowctx->gcm_copy_tosincectx->gcm_remainder_lenis larger than thectx->gcm_copy_tobuffer can hold.For ZoL the issue may be academic, since in all my testing I wasn't able to hit neither of both conditions needed to trigger it, but other consumers can easily do so.
The fix is to set
ctx->copy_toonly if it's not already set.How Has This Been Tested?
As part of another branch this survived 6 hours of zloop. Currently zloop fails with unmodified master within one hour, so can't use zloop to test this PR, sorry.
Types of changes
Checklist:
Signed-off-by.