mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-01 19:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

rand: Add missing check for rand_get_global

Browse Source 
As the potential failure of the rand_get_global(),
for example fail to get lock, 'dgbl' could be NULL
pointer and be dereferenced later.
Therefore, it should be better to check it and return
error if fails, like RAND_get0_primary() and other callers.

Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/17690)
This commit is contained in:
Jiasheng Jiang 2022-02-15 17:45:04 +08:00 committed by Dr. Matthias St. Pierre
parent d43597c718
commit 09dca55733
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/rand/rand_lib.c
View File

@ -529,6 +529,8 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
EVP_RAND_CTX *ctx; EVP_RAND_CTX *ctx;
char *name; char *name;
if (dgbl == NULL)
return NULL;
name = dgbl->seed_name != NULL ? dgbl->seed_name : "SEED-SRC"; name = dgbl->seed_name != NULL ? dgbl->seed_name : "SEED-SRC";
rand = EVP_RAND_fetch(libctx, name, dgbl->seed_propq); rand = EVP_RAND_fetch(libctx, name, dgbl->seed_propq);
if (rand == NULL) { if (rand == NULL) {
@ -561,6 +563,8 @@ static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
const OSSL_PARAM *settables; const OSSL_PARAM *settables;
char *name, *cipher; char *name, *cipher;
if (dgbl == NULL)
return NULL;
name = dgbl->rng_name != NULL ? dgbl->rng_name : "CTR-DRBG"; name = dgbl->rng_name != NULL ? dgbl->rng_name : "CTR-DRBG";
rand = EVP_RAND_fetch(libctx, name, dgbl->rng_propq); rand = EVP_RAND_fetch(libctx, name, dgbl->rng_propq);
if (rand == NULL) { if (rand == NULL) {
@ -763,6 +767,9 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
return 0; return 0;
} }
if (dgbl == NULL)
return 0;
for (i = 0; i < sk_CONF_VALUE_num(elist); i++) { for (i = 0; i < sk_CONF_VALUE_num(elist); i++) {
cval = sk_CONF_VALUE_value(elist, i); cval = sk_CONF_VALUE_value(elist, i);
if (strcasecmp(cval->name, "random") == 0) { if (strcasecmp(cval->name, "random") == 0) {