Make container_cleaner empty-safe#56
Open
kozyilmaz wants to merge 1 commit into
Open
Conversation
container_cleaner's destructor wiped its buffer with OPENSSL_cleanse(&_secret[0], _secret.size()). On an empty std::vector, &_secret[0] is out-of-bounds operator[] -- undefined behaviour, and a hardened build (_GLIBCXX_ASSERTIONS) or UBSan aborts on it (the std::string case is benign only by the s[0]==NUL special case). Guard on empty and take the address via data() instead of &_secret[0]: 'if (!_secret.empty()) OPENSSL_cleanse(_secret.data(), _secret.size());' No behaviour change when non-empty; a clean no-op when empty. Signed-off-by: kozyilmaz <kazim@monolytic.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.
container_cleaner's destructor wiped its buffer with OPENSSL_cleanse(&_secret[0], _secret.size()). On an empty std::vector, &_secret[0] is out-of-bounds operator[] -- undefined behaviour, and a hardened build (_GLIBCXX_ASSERTIONS) or UBSan aborts on it (the std::string case is benign only by the s[0]==NUL special case).
Guard on empty and take the address via data() instead of &_secret[0]: 'if (!_secret.empty()) OPENSSL_cleanse(_secret.data(), _secret.size());'
No behaviour change when non-empty; a clean no-op when empty.
Tests are kept in a separate branch (kozyilmaz@aa45120) but the fix is here. You can see the details below:
The tests are in another branch not to pollute the main tree but you can find the tests here: kozyilmaz@aa45120
after the fix the hardened test passes