Release the DRBG mutex when generation fails - #412
Open
EdouardMALOT wants to merge 1 commit into
Open
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
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.
Summary
_nx_crypto_drbg()takesNX_CRYPTO_DRBG_MUTEX_GETat the top, but returns early when_nx_crypto_drbg_generate()fails, so the mutex is never released.Both macros are empty by default and nothing in the repository defines them, so a default build is unaffected. Ports that do define them get a permanent deadlock instead of a returned error.
Found while working on #399.
Changes
crypto_libraries/src/nx_crypto_drbg.c— moveNX_CRYPTO_DRBG_MUTEX_PUTto just after_nx_crypto_drbg_generate(), before the status check. This also leaves the masking of the extra bits outside the critical section, which is fine since it only touches the caller's buffer.I left the ignored
_nx_crypto_drbg_initialize()return value on the line above alone; that is a separate question, and happy to look at it if you would like it in the same PR.Test plan
-Wall -Wextra -Wconversion