mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 12:04:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent a possible recursion in ERR_get_state and fix the problem that

Browse Source 
was pointed out in commit aef84bb4ef
differently.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5863)
This commit is contained in:
Bernd Edlinger 2018-04-03 23:47:10 +02:00
parent 284f4f6b70
commit 6b49b30811
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/err/err.c
View File

@ -667,25 +667,23 @@ ERR_STATE *ERR_get_state(void)
if (!RUN_ONCE(&err_init, err_do_init))
return NULL;
/*
* If base OPENSSL_init_crypto() hasn't been called yet, be sure to call
* it now to avoid state to be doubly allocated and thereby leak memory.
* Needed on any platform that doesn't define OPENSSL_USE_NODELETE.
*/
if (!OPENSSL_init_crypto(0, NULL))
state = CRYPTO_THREAD_get_local(&err_thread_local);
if (state == (ERR_STATE*)-1)
return NULL;
state = CRYPTO_THREAD_get_local(&err_thread_local);
if (state == NULL) {
if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
return NULL;
if ((state = OPENSSL_zalloc(sizeof(*state))) == NULL) {
/* ERRerr(ERR_F_ERR_GET_STATE, ERR_R_MALLOC_FAILURE); */
CRYPTO_THREAD_set_local(&err_thread_local, NULL);
return NULL;
}
if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE)
|| !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
|| !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
ERR_STATE_free(state);
CRYPTO_THREAD_set_local(&err_thread_local, NULL);
return NULL;
}

12
crypto/init.c
View File

@ -540,18 +540,8 @@ void OPENSSL_cleanup(void)
*/
int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
{
static int stoperrset = 0;
if (stopped) {
if (!stoperrset) {
/*
* We only ever set this once to avoid getting into an infinite
* loop where the error system keeps trying to init and fails so
* sets an error etc
*/
stoperrset = 1;
CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL);
}
CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL);
return 0;
}