diff options
| author | Jiasheng Jiang <jiasheng@iscas.ac.cn> | 2022-02-15 17:45:04 +0800 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2022-02-20 13:09:27 +0100 |
| commit | 09dca557332a2187598932388ac7bd7bbf16172b (patch) | |
| tree | dff4964a807978d6677285bb2e7b17225a30b834 /crypto | |
| parent | d43597c718dd6e4f2b18d5cec1eb791503a18988 (diff) | |
rand: Add missing check for rand_get_global
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rand/rand_lib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 4f36e84bd4..c772bcc79c 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -529,6 +529,8 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx) EVP_RAND_CTX *ctx; char *name; + if (dgbl == NULL) + return NULL; name = dgbl->seed_name != NULL ? dgbl->seed_name : "SEED-SRC"; rand = EVP_RAND_fetch(libctx, name, dgbl->seed_propq); 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; char *name, *cipher; + if (dgbl == NULL) + return NULL; name = dgbl->rng_name != NULL ? dgbl->rng_name : "CTR-DRBG"; rand = EVP_RAND_fetch(libctx, name, dgbl->rng_propq); if (rand == NULL) { @@ -763,6 +767,9 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf) return 0; } + if (dgbl == NULL) + return 0; + for (i = 0; i < sk_CONF_VALUE_num(elist); i++) { cval = sk_CONF_VALUE_value(elist, i); if (strcasecmp(cval->name, "random") == 0) { |