diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-07 11:23:37 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-07 11:23:37 -0400 |
| commit | be606c013d31847718ceb5d97c567988a771c2e5 (patch) | |
| tree | 62f2994124f8830b3f71f2ccf60d9e56a713fb33 /crypto/lhash/lhash_lcl.h | |
| parent | db0f35dda18403accabe98e7780f3dfc516f49de (diff) | |
Add a lock around the OBJ_NAME table
Various initialization functions modify this table, which can cause heap
corruption in the absence of external synchronization.
Some stats are modified from OPENSSL_LH_retrieve, where callers aren't
expecting to have to take out an exclusive lock. Switch to using atomic
operations for those stats.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3525)
Diffstat (limited to 'crypto/lhash/lhash_lcl.h')
| -rw-r--r-- | crypto/lhash/lhash_lcl.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/crypto/lhash/lhash_lcl.h b/crypto/lhash/lhash_lcl.h index eb4a1a3f65..01d463fb36 100644 --- a/crypto/lhash/lhash_lcl.h +++ b/crypto/lhash/lhash_lcl.h @@ -6,7 +6,7 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ - +#include <openssl/crypto.h> struct lhash_node_st { void *data; @@ -18,6 +18,13 @@ struct lhash_st { OPENSSL_LH_NODE **b; OPENSSL_LH_COMPFUNC comp; OPENSSL_LH_HASHFUNC hash; + /* + * some stats are updated on lookup, which callers aren't expecting to have + * to take an exclusive lock around. This lock protects them on platforms + * without atomics, and their types are int rather than unsigned long below + * so they can be adjusted with CRYPTO_atomic_add. + */ + CRYPTO_RWLOCK *retrieve_stats_lock; unsigned int num_nodes; unsigned int num_alloc_nodes; unsigned int p; @@ -29,14 +36,14 @@ struct lhash_st { unsigned long num_expand_reallocs; unsigned long num_contracts; unsigned long num_contract_reallocs; - unsigned long num_hash_calls; - unsigned long num_comp_calls; + int num_hash_calls; + int num_comp_calls; unsigned long num_insert; unsigned long num_replace; unsigned long num_delete; unsigned long num_no_delete; - unsigned long num_retrieve; - unsigned long num_retrieve_miss; - unsigned long num_hash_comps; + int num_retrieve; + int num_retrieve_miss; + int num_hash_comps; int error; }; |