Commit c8ec3410 authored by Rich Salz's avatar Rich Salz
Browse files

Only release thread-local key if we created it. 



Thanks to Jan Alexander Steffens for finding the bug and confirming the
fix.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3592)
(cherry picked from commit 73bc5370)
parent 3dbd32c4

crypto/err/err.c

+4 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = { 
#endif



static CRYPTO_ONCE err_init = CRYPTO_ONCE_STATIC_INIT;

static int set_err_thread_local;

static CRYPTO_THREAD_LOCAL err_thread_local;



static CRYPTO_ONCE err_string_init = CRYPTO_ONCE_STATIC_INIT;
@@ -260,6 +261,7 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init) 


void err_cleanup(void)

{

    if (set_err_thread_local != 0)

        CRYPTO_THREAD_cleanup_local(&err_thread_local);

    CRYPTO_THREAD_lock_free(err_string_lock);

    err_string_lock = NULL;
@@ -639,6 +641,7 @@ void ERR_remove_state(unsigned long pid) 


DEFINE_RUN_ONCE_STATIC(err_do_init)

{

    set_err_thread_local = 1;

    return CRYPTO_THREAD_init_local(&err_thread_local, NULL);

}