From adeb4bc7a03aa61b6b26c3857dd91b05164daa60 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Fri, 26 Jan 2018 09:32:40 -0600 Subject: [PATCH] Restore clearing of init_lock after free The behavior of resetting the init_lock value to NULL after freeing it during OPENSSL_cleanup() was added as part of the global lock commits that were just reverted, but there is desire to retain this behavior for clarity. It is unclear that the library would actually remain usable in any form after OPENSSL_cleanup(), since the required re-initialization occurs under a CRYPTO_ONCE check that cannot be reset at cleanup time. That said, a NULL dereference is probably more friendly behavior in these treacherous waters than using freed memory would be. Reviewed-by: Kurt Roeckx Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/5089) --- crypto/init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/crypto/init.c b/crypto/init.c index 71accaa2ca..1b94d07e04 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -421,6 +421,7 @@ void OPENSSL_cleanup(void) stop_handlers = NULL; CRYPTO_THREAD_lock_free(init_lock); + init_lock = NULL; /* * We assume we are single-threaded for this function, i.e. no race -- 2.25.1