ext/openssl: scrub symmetric key material before freeing - #23778
Merged
Merged
Conversation
When the supplied key is shorter than the cipher's key length, php_openssl_cipher_init() allocates a heap buffer, copies the key into it and zero-pads it to the required length. openssl_encrypt() and openssl_decrypt() then efree() this buffer without wiping it, leaving the raw symmetric key in a reclaimed heap chunk where it can later be exposed through an uninitialized-heap read, a core dump or /proc. Scrub the buffer with ZEND_SECURE_ZERO() before freeing it, matching what ext/hash, ext/standard/crypt* and ext/sodium already do for key material. At the free site password_len has already been set to the full allocation size, so the whole buffer is cleared.
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
2 participants
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.
When the supplied key is shorter than the cipher's key length, php_openssl_cipher_init() allocates a heap buffer, copies the key into it and zero-pads it to the required length. openssl_encrypt() and openssl_decrypt() then efree() this buffer without wiping it, leaving the raw symmetric key in a reclaimed heap chunk where it can later be exposed through an uninitialized-heap read, a core dump or /proc.
Scrub the buffer with ZEND_SECURE_ZERO() before freeing it, matching what ext/hash, ext/standard/crypt* and ext/sodium already do for key material. At the free site password_len has already been set to the full allocation size, so the whole buffer is cleared.