diff options
| author | Matt Caswell <matt@openssl.org> | 2020-12-11 16:29:25 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-01-14 17:30:46 +0000 |
| commit | c25a1524aad3a2f3a5d74880d8016de31f59adc8 (patch) | |
| tree | 6a911ec1c0d1e17fc0126fbb94b3a21834e13a9b /crypto | |
| parent | 886ad0045bf128795049b48f7d7977f72cc7220c (diff) | |
Lock the provider operation_bits
The provider operation_bits array can see concurrent access by multiple
threads and can be reallocated at any time. Therefore we need to ensure
that it is appropriately locked.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13660)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/provider_core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/provider_core.c b/crypto/provider_core.c index f0d6fb20f8..79c548e52d 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -85,6 +85,7 @@ struct ossl_provider_st { */ unsigned char *operation_bits; size_t operation_bits_sz; + CRYPTO_RWLOCK *opbits_lock; /* Provider side data */ void *provctx; @@ -252,6 +253,7 @@ static OSSL_PROVIDER *provider_new(const char *name, || (prov->activatecnt_lock = CRYPTO_THREAD_lock_new()) == NULL #endif || !ossl_provider_up_ref(prov) /* +1 One reference to be returned */ + || (prov->opbits_lock = CRYPTO_THREAD_lock_new()) == NULL || (prov->name = OPENSSL_strdup(name)) == NULL) { ossl_provider_free(prov); ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); @@ -371,6 +373,7 @@ void ossl_provider_free(OSSL_PROVIDER *prov) OPENSSL_free(prov->name); OPENSSL_free(prov->path); sk_INFOPAIR_pop_free(prov->parameters, free_infopair); + CRYPTO_THREAD_lock_free(prov->opbits_lock); #ifndef HAVE_ATOMICS CRYPTO_THREAD_lock_free(prov->refcnt_lock); CRYPTO_THREAD_lock_free(prov->activatecnt_lock); @@ -907,11 +910,13 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum) size_t byte = bitnum / 8; unsigned char bit = (1 << (bitnum % 8)) & 0xFF; + CRYPTO_THREAD_write_lock(provider->opbits_lock); if (provider->operation_bits_sz <= byte) { unsigned char *tmp = OPENSSL_realloc(provider->operation_bits, byte + 1); if (tmp == NULL) { + CRYPTO_THREAD_unlock(provider->opbits_lock); ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); return 0; } @@ -921,6 +926,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum) provider->operation_bits_sz = byte + 1; } provider->operation_bits[byte] |= bit; + CRYPTO_THREAD_unlock(provider->opbits_lock); return 1; } @@ -936,8 +942,10 @@ int ossl_provider_test_operation_bit(OSSL_PROVIDER *provider, size_t bitnum, } *result = 0; + CRYPTO_THREAD_read_lock(provider->opbits_lock); if (provider->operation_bits_sz > byte) *result = ((provider->operation_bits[byte] & bit) != 0); + CRYPTO_THREAD_unlock(provider->opbits_lock); return 1; } |