kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Free all error queues on shutdown.

Browse Source 
As feared, 2bca0988 did cause some leak checkers to get upset about the
state_hash pointer getting cleared.

This change makes err_shutdown free all the error queues to try and
avoid this. Hopefully this doesn't upset TSAN in turn.

BUG=448296

Change-Id: I827da63c793dcabc73168ece052cdcd3d3cc64e3
Reviewed-on: https://boringssl-review.googlesource.com/2890
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2015-01-14 17:49:32 -08:00
parent d749af7ab1
commit f0eb169829
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crypto/err/err.c
View File

@ -296,10 +296,21 @@ void ERR_clear_error(void) {
state->top = state->bottom = 0; state->top = state->bottom = 0;
} }
static void err_state_free(ERR_STATE *state) {
unsigned i;
for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear(&state->errors[i]);
}
if (state->to_free) {
OPENSSL_free(state->to_free);
}
OPENSSL_free(state);
}
void ERR_remove_thread_state(const CRYPTO_THREADID *tid) { void ERR_remove_thread_state(const CRYPTO_THREADID *tid) {
CRYPTO_THREADID current; CRYPTO_THREADID current;
ERR_STATE *state; ERR_STATE *state;
unsigned i;
if (tid == NULL) { if (tid == NULL) {
CRYPTO_THREADID_current(&current); CRYPTO_THREADID_current(&current);
@ -312,13 +323,7 @@ void ERR_remove_thread_state(const CRYPTO_THREADID *tid) {
return; return;
} }
for (i = 0; i < ERR_NUM_ERRORS; i++) { err_state_free(state);
err_clear(&state->errors[i]);
}
if (state->to_free) {
OPENSSL_free(state->to_free);
}
OPENSSL_free(state);
} }
int ERR_get_next_error_library(void) { int ERR_get_next_error_library(void) {
@ -800,7 +805,7 @@ void ERR_load_crypto_strings(void) { err_load_strings(); }
void ERR_free_strings(void) { void ERR_free_strings(void) {
err_fns_check(); err_fns_check();
ERRFN(shutdown)(); ERRFN(shutdown)(err_state_free);
} }
void ERR_load_BIO_strings(void) {} void ERR_load_BIO_strings(void) {}

3
crypto/err/err_impl.c
View File

@ -287,13 +287,14 @@ static ERR_STATE *err_release_state(const CRYPTO_THREADID *tid) {
return state; return state;
} }
static void err_shutdown(void) { static void err_shutdown(void (*err_state_free_cb)(ERR_STATE*)) {
CRYPTO_w_lock(CRYPTO_LOCK_ERR); CRYPTO_w_lock(CRYPTO_LOCK_ERR);
if (error_hash) { if (error_hash) {
lh_ERR_STRING_DATA_free(error_hash); lh_ERR_STRING_DATA_free(error_hash);
error_hash = NULL; error_hash = NULL;
} }
if (state_hash) { if (state_hash) {
lh_ERR_STATE_doall(state_hash, err_state_free_cb);
lh_ERR_STATE_free(state_hash); lh_ERR_STATE_free(state_hash);
state_hash = NULL; state_hash = NULL;
} }

2
include/openssl/err.h
View File

@ -488,7 +488,7 @@ OPENSSL_EXPORT void ERR_load_strings(const ERR_STRING_DATA *str);
/* ERR_FNS_st is a structure of function pointers that contains the actual /* ERR_FNS_st is a structure of function pointers that contains the actual
* implementation of the error queue handling functions. */ * implementation of the error queue handling functions. */
struct ERR_FNS_st { struct ERR_FNS_st {
void (*shutdown)(void); void (*shutdown)(void (*err_state_free_cb)(ERR_STATE*));
ERR_STRING_DATA *(*get_item)(uint32_t packed_error); ERR_STRING_DATA *(*get_item)(uint32_t packed_error);
ERR_STRING_DATA *(*set_item)(const ERR_STRING_DATA *); ERR_STRING_DATA *(*set_item)(const ERR_STRING_DATA *);
ERR_STRING_DATA *(*del_item)(uint32_t packed_error); ERR_STRING_DATA *(*del_item)(uint32_t packed_error);