Don't open random devices while cleaning up.#7023
Closed
mspncp wants to merge 2 commits intoopenssl:masterfrom
Closed
Don't open random devices while cleaning up.#7023mspncp wants to merge 2 commits intoopenssl:masterfrom
mspncp wants to merge 2 commits intoopenssl:masterfrom
Conversation
Fixes openssl#7022 In pull request openssl#6432 a change was made to keep the handles to the random devices opened in order to avoid reseeding problems for applications in chroot environments. As a consequence, the handles of the random devices were leaked at exit if the random generator was not used by the application. This happened, because the call to RAND_set_rand_method(NULL) in rand_cleanup_int() triggered a call to the call_once function do_rand_init, which opened the random devices via rand_pool_init(void). Thanks to GitHub user @bwelling for reporting this issue.
mspncp
force-pushed
the
pr-fix-random-device-handle-leak
branch
from
8d4486a to
a18990d
Compare
mspncp
commented
Aug 21, 2018
| meth->cleanup(); | ||
| rand_pool_cleanup(); | ||
| RAND_set_rand_method(NULL); | ||
| rand_pool_cleanup(); |
Contributor
Author
There was a problem hiding this comment.
Swapping these two lines was my first attempt to fix the problem. However, the result was not satisfactory, because the devices were still opened by RAND_set_rand_method() and closed right afterwards in rand_pool_cleanup(). That's why I introduced rand_cleaning_up.
So strictly speaking this swapping is not necessary anymore, but conceptually it makes more sense to cleanup the entropy source after the random generator has been disabled and not before.
paulidale
reviewed
Aug 21, 2018
crypto/rand/rand_lib.c
Outdated
|
|
||
| if (!rand_pool_init()) | ||
| goto err3; | ||
| if (!rand_cleaning_up) |
Contributor
There was a problem hiding this comment.
Better might be using && rather than nesting the if statements?
paulidale
approved these changes
Aug 21, 2018
Contributor
paulidale
left a comment
paulidale
left a comment
There was a problem hiding this comment.
One minor cleaning but it's not vital.
mspncp
added
the
approval: done
Contributor
Author
|
I'll merge this evening. |
Contributor
Author
|
Editorial note: I intend to apply two small cosmetical changes to the commit message when merging: |
levitte
pushed a commit
that referenced
this pull request
Aug 22, 2018
Fixes #7022 In pull request #6432 a change was made to keep the handles to the random devices opened in order to avoid reseeding problems for applications in chroot environments. As a consequence, the handles of the random devices were leaked at exit if the random generator was not used by the application. This happened, because the call to RAND_set_rand_method(NULL) in rand_cleanup_int() triggered a call to the call_once function do_rand_init, which opened the random devices via rand_pool_init(). Thanks to GitHub user @bwelling for reporting this issue. Reviewed-by: Paul Dale <[email protected]> (Merged from #7023)
Contributor
Author
|
Ok, merged. Thanks! |
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.
Fixes #7022
In pull request #6432 a change was made to keep the handles to the
random devices opened in order to avoid reseeding problems for
applications in chroot environments.
As a consequence, the handles of the random devices were leaked at exit
if the random generator was not used by the application. This happened,
because the call to RAND_set_rand_method(NULL) in rand_cleanup_int()
triggered a call to the call_once function do_rand_init, which opened
the random devices via rand_pool_init(void).
Thanks to GitHub user @bwelling for reporting this issue.