Move shutdown mode workarounds move util_uri.c

Author: mtrojnar

src/eng_front.c

@@ -29,7 +29,6 @@
 #define PKCS11_ENGINE_NAME "pkcs11 engine"
 
 static int pkcs11_idx = -1;
-static int shutdown_mode = 0;
 
 /* The definitions for control commands specific to this engine */
 
@@ -152,14 +151,7 @@ static int engine_finish(ENGINE *engine)
 	if (!ctx)
 		return 0;
 
-	/* PKCS#11 modules that register their own atexit() callbacks may
-	 * already have been cleaned up by the time OpenSSL's atexit() callback
-	 * is executed. As a result, a crash occurs with certain versions of
-	 * OpenSSL and SoftHSM2. The workaround skips the execution of
-	 * ENGINE_CTX_finish() during OpenSSL's cleanup, converting the crash into
-	 * a harmless memory leak at exit. */
-	if (!shutdown_mode)
-		rv &= ENGINE_CTX_finish(ctx);
+	rv &= ENGINE_CTX_finish(ctx);
 
 	return rv;
 }
@@ -289,11 +281,6 @@ static int bind_helper_methods(ENGINE *e)
 	}
 }
 
-static void exit_callback(void)
-{
-	shutdown_mode = 1;
-}
-
 static int bind_fn(ENGINE *e, const char *id)
 {
 	if (id && (strcmp(id, PKCS11_ENGINE_ID) != 0)) {
@@ -304,7 +291,6 @@ static int bind_fn(ENGINE *e, const char *id)
 		ENGINE_CTX_log(NULL, LOG_ERR, "bind failed\n");
 		return 0;
 	}
-	atexit(exit_callback);
 	return 1;
 }
 

src/provider.c

@@ -143,8 +143,6 @@ typedef struct {
 	void *ui_method_data;
 } PASSPHRASE_DATA;
 
-static int g_shutdown_mode = 0;
-
 #if defined(_WIN32) || defined(_WIN64)
 #define strcasecmp _stricmp
 #endif
@@ -174,19 +172,6 @@ static void PROVIDER_CTX_log(PROVIDER_CTX *prov_ctx, int level, int reason, int
 	va_end(args);
 }
 
-/*
- * PKCS#11 modules that register their own atexit() callbacks may
- * already have been cleaned up by the time OpenSSL's atexit() callback
- * is executed. As a result, a crash occurs with certain versions of
- * OpenSSL and SoftHSM2. The workaround skips the execution of
- * ENGINE_CTX_finish() during OpenSSL's cleanup, converting the crash into
- * a harmless memory leak at exit.
- */
-static void exit_callback(void)
-{
-	g_shutdown_mode = 1;
-}
-
 /*
  * Updates the provider context with environment variable values.
  */
@@ -341,8 +326,7 @@ static PROVIDER_CTX *PROVIDER_CTX_new(void)
  */
 static void PROVIDER_CTX_destroy(PROVIDER_CTX *prov_ctx)
 {
-	if (!g_shutdown_mode)
-		UTIL_CTX_free_libp11(prov_ctx->util_ctx);
+	UTIL_CTX_free_libp11(prov_ctx->util_ctx);
 	UTIL_CTX_free(prov_ctx->util_ctx);
 	OPENSSL_free(prov_ctx->provider_name);
 	OPENSSL_free(prov_ctx->pkcs11_module);
@@ -479,7 +463,6 @@ static int provider_init(const OSSL_CORE_HANDLE *handle, const OSSL_DISPATCH *in
 	*out = provider_functions;
 	*ctx = prov_ctx;
 
-	atexit(exit_callback);
 	return 1;
 
 err:

src/util_uri.c

@@ -75,6 +75,8 @@ struct util_ctx_st {
 
 };
 
+static int g_shutdown_mode = 0;
+
 /******************************************************************************/
 /* Initialization                                                             */
 /******************************************************************************/
@@ -139,8 +141,19 @@ static int util_ctx_enumerate_slots_unlocked(UTIL_CTX *ctx)
 	return 1;
 }
 
-/* Initialize libp11 data: ctx->pkcs11_ctx and ctx->slot_list */
+/*
+ * PKCS#11 modules that register their own atexit() callbacks may already have
+ * been cleaned up by the time OpenSSL's atexit() callback is executed.
+ * As a result, a crash occurs with certain versions of OpenSSL and SoftHSM2.
+ * The workaround skips libp11 cleanup during OpenSSL's cleanup, converting
+ * the crash into a harmless memory leak at exit.
+ */
+static void exit_callback(void)
+{
+	g_shutdown_mode = 1;
+}
 
+/* Initialize libp11 data: ctx->pkcs11_ctx and ctx->slot_list */
 static int util_ctx_init_libp11(UTIL_CTX *ctx)
 {
 	if (ctx->pkcs11_ctx && ctx->slot_list && ctx->slot_count > 0)
@@ -163,6 +176,7 @@ static int util_ctx_init_libp11(UTIL_CTX *ctx)
 		UTIL_CTX_free_libp11(ctx);
 		return -1;
 	}
+	atexit(exit_callback);
 	return 0;
 }
 
@@ -182,14 +196,17 @@ int UTIL_CTX_enumerate_slots(UTIL_CTX *ctx)
 void UTIL_CTX_free_libp11(UTIL_CTX *ctx)
 {
 	if (ctx->slot_list) {
-		PKCS11_release_all_slots(ctx->pkcs11_ctx,
-			ctx->slot_list, ctx->slot_count);
+		if (!g_shutdown_mode)
+			PKCS11_release_all_slots(ctx->pkcs11_ctx,
+				ctx->slot_list, ctx->slot_count);
 		ctx->slot_list = NULL;
 		ctx->slot_count = 0;
 	}
 	if (ctx->pkcs11_ctx) {
-		PKCS11_CTX_unload(ctx->pkcs11_ctx);
-		PKCS11_CTX_free(ctx->pkcs11_ctx);
+		if (!g_shutdown_mode) {
+			PKCS11_CTX_unload(ctx->pkcs11_ctx);
+			PKCS11_CTX_free(ctx->pkcs11_ctx);
+		}
 		ctx->pkcs11_ctx = NULL;
 	}
 }