mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-05 14:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't bail out during provider deactivation if we don't have store

Browse Source 
A provider may have been activated, but failed when being added to
the store. At this point we still need to deactivate it.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16980)
This commit is contained in:
Matt Caswell 2021-11-09 11:53:27 +00:00
parent dc6d9ede62
commit e39bd62151
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/provider_core.c
View File

@ -1015,17 +1015,22 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
#ifndef FIPS_MODULE
int freeparent = 0;
#endif
int lock = 1;
if (!ossl_assert(prov != NULL))
return -1;
/*
* No need to lock if we've got no store because we've not been shared with
* other threads.
*/
store = get_provider_store(prov->libctx);
if (store == NULL)
return -1;
lock = 0;
if (!CRYPTO_THREAD_read_lock(store->lock))
if (lock && !CRYPTO_THREAD_read_lock(store->lock))
return -1;
if (!CRYPTO_THREAD_write_lock(prov->flag_lock)) {
if (lock && !CRYPTO_THREAD_write_lock(prov->flag_lock)) {
CRYPTO_THREAD_unlock(store->lock);
return -1;
}
@ -1049,10 +1054,11 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
removechildren = 0;
#endif
CRYPTO_THREAD_unlock(prov->flag_lock);
if (lock)
CRYPTO_THREAD_unlock(prov->flag_lock);
#ifndef FIPS_MODULE
if (removechildren) {
if (removechildren && store != NULL) {
int i, max = sk_OSSL_PROVIDER_CHILD_CB_num(store->child_cbs);
OSSL_PROVIDER_CHILD_CB *child_cb;
@ -1062,7 +1068,8 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
}
}
#endif
CRYPTO_THREAD_unlock(store->lock);
if (lock)
CRYPTO_THREAD_unlock(store->lock);
#ifndef FIPS_MODULE
if (freeparent)
ossl_provider_free_parent(prov, 1);