From 4baee3031cf5529f519756b7a30bd5b078980c74 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 11 May 2012 13:49:15 +0000 Subject: [PATCH] PR: 2813 Reported by: Constantine Sapuntzakis Fix possible deadlock when decoding public keys. --- CHANGES | 3 ++- crypto/asn1/x_pubkey.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 559a8f6736..0831bb316f 100644 --- a/CHANGES +++ b/CHANGES @@ -4,7 +4,8 @@ Changes between 0.9.8x and 0.9.8y [xx XXX xxxx] - *) + *) Fix possible deadlock when decoding public keys. + [Steve Henson] Changes between 0.9.8w and 0.9.8x [10 May 2012] diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 94d9f7ebab..bc8a7bf327 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -371,12 +371,15 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY); if (key->pkey) { + CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); EVP_PKEY_free(ret); ret = key->pkey; } else + { key->pkey = ret; - CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); + CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); + } CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY); return(ret); err: -- 2.25.1