diff options
| author | Matt Caswell <matt@openssl.org> | 2021-02-19 17:03:43 +0000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-25 08:37:22 +1000 |
| commit | d84f5515faf3fe00ed5eeca7e7b8b041be863e90 (patch) | |
| tree | b2e8245e0a152f16b5bb2c5260e47781a6261c9d /crypto/evp/digest.c | |
| parent | 6be27456e1346121b1fed797e92353733b59e16e (diff) | |
Don't hold a lock when calling a callback in ossl_namemap_doall_names
We don't want to hold a read lock when calling a user supplied callback.
That callback could do anything so the risk of a deadlock is high.
Instead we collect all the names first inside the read lock, and then
subsequently call the user callback outside the read lock.
Fixes #14225
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14250)
Diffstat (limited to 'crypto/evp/digest.c')
| -rw-r--r-- | crypto/evp/digest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 7346169be6..e322654241 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -881,8 +881,8 @@ static void *evp_md_from_dispatch(int name_id, #ifndef FIPS_MODULE /* TODO(3.x) get rid of the need for legacy NIDs */ md->type = NID_undef; - evp_names_do_all(prov, name_id, set_legacy_nid, &md->type); - if (md->type == -1) { + if (!evp_names_do_all(prov, name_id, set_legacy_nid, &md->type) + || md->type == -1) { ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR); EVP_MD_free(md); return NULL; |