mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-09 05:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

CONF_modules_unload should fail if CONF_modules_finish fails

Browse Source 
The module_list_lock is used by CONF_modules_unload(). That function relies
on the RUN_ONCE in CONF_modules_finish() to initialise that lock. However
if the RUN_ONCE fails that failure is not propagated to
CONF_modules_unload() and so it erroneously tries to use the lock anyway.

Found due to:
https://github.com/openssl/openssl/pull/18355#issuecomment-1144734604

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18460)
This commit is contained in:
Matt Caswell 2022-06-02 13:54:45 +01:00 committed by Tomas Mraz
parent 1a01e5c29d
commit 697d0b5ba1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/conf/conf_mod.c
View File

@ -82,6 +82,8 @@ static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
static CONF_MODULE *module_load_dso(const CONF *cnf, const char *name, static CONF_MODULE *module_load_dso(const CONF *cnf, const char *name,
const char *value); const char *value);
static int conf_modules_finish_int(void);
static void module_lists_free(void) static void module_lists_free(void)
{ {
CRYPTO_THREAD_lock_free(module_list_lock); CRYPTO_THREAD_lock_free(module_list_lock);
@ -477,7 +479,8 @@ void CONF_modules_unload(int all)
int i; int i;
CONF_MODULE *md; CONF_MODULE *md;
CONF_modules_finish(); /* also inits module list lock */ if (!conf_modules_finish_int()) /* also inits module list lock */
return;
if (!CRYPTO_THREAD_write_lock(module_list_lock)) if (!CRYPTO_THREAD_write_lock(module_list_lock))
return; return;
@ -511,15 +514,15 @@ static void module_free(CONF_MODULE *md)
/* finish and free up all modules instances */ /* finish and free up all modules instances */
void CONF_modules_finish(void) static int conf_modules_finish_int(void)
{ {
CONF_IMODULE *imod; CONF_IMODULE *imod;
if (!RUN_ONCE(&init_module_list_lock, do_init_module_list_lock)) if (!RUN_ONCE(&init_module_list_lock, do_init_module_list_lock))
return; return 0;
if (!CRYPTO_THREAD_write_lock(module_list_lock)) if (!CRYPTO_THREAD_write_lock(module_list_lock))
return; return 0;
while (sk_CONF_IMODULE_num(initialized_modules) > 0) { while (sk_CONF_IMODULE_num(initialized_modules) > 0) {
imod = sk_CONF_IMODULE_pop(initialized_modules); imod = sk_CONF_IMODULE_pop(initialized_modules);
@ -529,6 +532,13 @@ void CONF_modules_finish(void)
initialized_modules = NULL; initialized_modules = NULL;
CRYPTO_THREAD_unlock(module_list_lock); CRYPTO_THREAD_unlock(module_list_lock);
return 1;
}
void CONF_modules_finish(void)
{
conf_modules_finish_int();
} }
/* finish a module instance */ /* finish a module instance */