mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

rand: don't free an mis-set pointer on error

Browse Source 
This is adding robustness to the code.  The fix to not mis-set the pointer
is in #16636.

Fixes #16631

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16640)
This commit is contained in:
Pauli 2021-09-21 09:19:35 +10:00
parent 57cd10dd1e
commit caf569a5b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/implementations/rands/drbg.c
View File

@ -459,9 +459,11 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
if (!drbg->instantiate(drbg, entropy, entropylen, nonce, noncelen, if (!drbg->instantiate(drbg, entropy, entropylen, nonce, noncelen,
pers, perslen)) { pers, perslen)) {
cleanup_entropy(drbg, entropy, entropylen);
ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_INSTANTIATING_DRBG); ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_INSTANTIATING_DRBG);
goto end; goto end;
} }
cleanup_entropy(drbg, entropy, entropylen);
drbg->state = EVP_RAND_STATE_READY; drbg->state = EVP_RAND_STATE_READY;
drbg->generate_counter = 1; drbg->generate_counter = 1;
@ -469,8 +471,6 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
tsan_store(&drbg->reseed_counter, drbg->reseed_next_counter); tsan_store(&drbg->reseed_counter, drbg->reseed_next_counter);
end: end:
if (entropy != NULL)
cleanup_entropy(drbg, entropy, entropylen);
if (nonce != NULL) if (nonce != NULL)
ossl_prov_cleanup_nonce(drbg->provctx, nonce, noncelen); ossl_prov_cleanup_nonce(drbg->provctx, nonce, noncelen);
if (drbg->state == EVP_RAND_STATE_READY) if (drbg->state == EVP_RAND_STATE_READY)