115 lines
4.0 KiB
Diff
115 lines
4.0 KiB
Diff
From 40928425d848827fa8427d677e37178ab3b57e50 Mon Sep 17 00:00:00 2001
|
|
From: Juergen Christ <jchrist@linux.ibm.com>
|
|
Date: Fri, 23 Apr 2021 15:09:36 +0200
|
|
Subject: [PATCH] Fix for multiple loading of the engine.
|
|
|
|
The ibmca engine global state gets destroyed if the engine is loaded multiple
|
|
times. This happens, e.g., during a git clone via https where first
|
|
git-remote-https loads the engine and initializes it, and the libcurl loads
|
|
the engine a second time, does not initialize it, but then destroy its second
|
|
copy. During destruction, OpenSSL calls into the ibmca_destroy function when
|
|
then manipulates global state that is shared with the first engine (the one
|
|
loaded by git-remote-https which is still actively used).
|
|
|
|
Furthermore, the second load changes some global variables which causes the
|
|
engine to not have any pkey methods registered anymore.
|
|
|
|
To fix this, add a load count and only destroy global state once the load
|
|
count drops to zero. Also move the setting of the engine properties from the
|
|
load phase (where OpenSSL only creates a structural reference) to the
|
|
initialization phase (where OpenSSL create a functional reference). This
|
|
prevents another overwrite of global variables.
|
|
|
|
Signed-off-by: Juergen Christ <jchrist@linux.ibm.com>
|
|
---
|
|
src/e_ibmca.c | 29 +++++++++++++++++++++++++----
|
|
1 file changed, 25 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/e_ibmca.c b/src/e_ibmca.c
|
|
index b448e2c..a9b8a10 100644
|
|
--- a/src/e_ibmca.c
|
|
+++ b/src/e_ibmca.c
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Copyright [2005-2018] International Business Machines Corp.
|
|
+ * Copyright [2005-2021] International Business Machines Corp.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
@@ -175,6 +175,10 @@ static size_t size_cipher_list = 0;
|
|
static size_t size_digest_list = 0;
|
|
static size_t size_pkey_meths_list = 0;
|
|
|
|
+static CRYPTO_ONCE bindcountlockinitonce = CRYPTO_ONCE_STATIC_INIT;
|
|
+static CRYPTO_RWLOCK *bindcountlock = NULL;
|
|
+static int bindcount = 0;
|
|
+
|
|
static struct crypto_pair ibmca_cipher_lists;
|
|
static struct crypto_pair ibmca_digest_lists;
|
|
static struct crypto_pair ibmca_pkey_meths_lists;
|
|
@@ -189,6 +193,11 @@ static int ibmca_engine_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
|
|
const int **nids, int nid);
|
|
static int ibmca_usable_pkey_meths(const int **nids);
|
|
|
|
+static void bindcountlockinit(void)
|
|
+{
|
|
+ bindcountlock = CRYPTO_THREAD_lock_new();
|
|
+}
|
|
+
|
|
/* RAND stuff */
|
|
static int ibmca_rand_bytes(unsigned char *buf, int num);
|
|
static int ibmca_rand_status(void);
|
|
@@ -217,6 +226,10 @@ static const ENGINE_CMD_DEFN ibmca_cmd_defns[] = {
|
|
/* Destructor (complements the "ENGINE_ibmca()" constructor) */
|
|
static int ibmca_destroy(ENGINE *e)
|
|
{
|
|
+ int newbindcount;
|
|
+ CRYPTO_atomic_add(&bindcount, -1, &newbindcount, bindcountlock);
|
|
+ if (newbindcount)
|
|
+ return 1;
|
|
/* Unload the ibmca error strings so any error state including our
|
|
* functs or reasons won't lead to a segfault (they simply get displayed
|
|
* without corresponding string data because none will be found).
|
|
@@ -785,6 +798,9 @@ static void ibmca_destructor(void)
|
|
}
|
|
|
|
p_ica_close_adapter(ibmca_handle);
|
|
+
|
|
+ if (bindcountlock)
|
|
+ CRYPTO_THREAD_lock_free(bindcountlock);
|
|
}
|
|
|
|
static int ibmca_init(ENGINE *e)
|
|
@@ -792,6 +808,9 @@ static int ibmca_init(ENGINE *e)
|
|
if (ibmca_dso == NULL)
|
|
return 0;
|
|
|
|
+ if (!set_supported_meths(e))
|
|
+ return 0;
|
|
+
|
|
return 1;
|
|
}
|
|
|
|
@@ -829,6 +848,11 @@ static int ibmca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ())
|
|
*/
|
|
static int bind_helper(ENGINE *e)
|
|
{
|
|
+ int ignored;
|
|
+
|
|
+ CRYPTO_THREAD_run_once(&bindcountlockinitonce, bindcountlockinit);
|
|
+
|
|
+ CRYPTO_atomic_add(&bindcount, 1, &ignored, bindcountlock);
|
|
ERR_load_IBMCA_strings();
|
|
|
|
if (!ENGINE_set_id(e, engine_ibmca_id) ||
|
|
@@ -843,9 +867,6 @@ static int bind_helper(ENGINE *e)
|
|
if (ibmca_dso == NULL)
|
|
return 0;
|
|
|
|
- if (!set_supported_meths(e))
|
|
- return 0;
|
|
-
|
|
return 1;
|
|
}
|
|
|