From c5657b7386f8be722e3d87c70b9e049d2b843c0d Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 2 Aug 2017 09:54:18 +0200 Subject: [PATCH] tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) (cherry picked from commit 071b85f66cabaa3a705a014b26b7c1eb31029b26) --- modules/tls/tls_init.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 133bc7fc83c..1ce9d716a5d 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }