diff options
| author | Bodo Möller <bodo@openssl.org> | 2012-10-05 20:50:38 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2012-10-05 20:50:38 +0000 |
| commit | b626f0396c308aa10eb19862ebe2afdd6e855b29 (patch) | |
| tree | 3a009ffca6b2bc358effe62a891a7d8255219d1f /crypto/ecdh | |
| parent | 9d2006d8ed733522014035ec0514e23a312083e8 (diff) | |
Fix EC_KEY initialization race.
Submitted by: Adam Langley
Diffstat (limited to 'crypto/ecdh')
| -rw-r--r-- | crypto/ecdh/ech_lib.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/ecdh/ech_lib.c b/crypto/ecdh/ech_lib.c index dadbfd3c49..0644431b75 100644 --- a/crypto/ecdh/ech_lib.c +++ b/crypto/ecdh/ech_lib.c @@ -222,8 +222,15 @@ ECDH_DATA *ecdh_check(EC_KEY *key) ecdh_data = (ECDH_DATA *)ecdh_data_new(); if (ecdh_data == NULL) return NULL; - EC_KEY_insert_key_method_data(key, (void *)ecdh_data, - ecdh_data_dup, ecdh_data_free, ecdh_data_free); + data = EC_KEY_insert_key_method_data(key, (void *)ecdh_data, + ecdh_data_dup, ecdh_data_free, ecdh_data_free); + if (data != NULL) + { + /* Another thread raced us to install the key_method + * data and won. */ + ecdh_data_free(ecdh_data); + ecdh_data = (ECDH_DATA *)data; + } } else ecdh_data = (ECDH_DATA *)data; |