[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
bernd.edlinger at hotmail.de
bernd.edlinger at hotmail.de
Thu Apr 26 16:41:57 UTC 2018
The branch OpenSSL_1_1_0-stable has been updated
via ba1cf1b1a130f31deee8736dc225e77b746fe5df (commit)
from db747425b0caae12e73c680799b57bdfcc72dbb4 (commit)
- Log -----------------------------------------------------------------
commit ba1cf1b1a130f31deee8736dc225e77b746fe5df
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date: Thu Apr 26 18:39:51 2018 +0200
Fix memleaks in async api
Fixes: #5950
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6038)
(cherry picked from commit 74a8acbdfb2c7f398d1ae2fe914cd32b437f6df4)
-----------------------------------------------------------------------
Summary of changes:
crypto/async/async.c | 74 +++++++++++++++++++++++++----------------
crypto/include/internal/async.h | 1 +
crypto/init.c | 4 +--
3 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/crypto/async/async.c b/crypto/async/async.c
index 9a4e6b2..6191df9 100644
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -30,11 +30,12 @@
static CRYPTO_THREAD_LOCAL ctxkey;
static CRYPTO_THREAD_LOCAL poolkey;
-static void async_free_pool_internal(async_pool *pool);
-
static async_ctx *async_ctx_new(void)
{
- async_ctx *nctx = NULL;
+ async_ctx *nctx;
+
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC))
+ return NULL;
nctx = OPENSSL_malloc(sizeof(async_ctx));
if (nctx == NULL) {
@@ -57,9 +58,6 @@ err:
async_ctx *async_get_ctx(void)
{
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
- return NULL;
-
return (async_ctx *)CRYPTO_THREAD_get_local(&ctxkey);
}
@@ -169,16 +167,19 @@ void async_start_func(void)
int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
int (*func)(void *), void *args, size_t size)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return ASYNC_ERR;
+
+ ctx = async_get_ctx();
if (ctx == NULL)
ctx = async_ctx_new();
- if (ctx == NULL) {
+ if (ctx == NULL)
return ASYNC_ERR;
- }
- if (*job) {
+ if (*job)
ctx->currjob = *job;
- }
for (;;) {
if (ctx->currjob != NULL) {
@@ -219,9 +220,8 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
}
/* Start a new job */
- if ((ctx->currjob = async_get_pool_job()) == NULL) {
+ if ((ctx->currjob = async_get_pool_job()) == NULL)
return ASYNC_NO_JOBS;
- }
if (args != NULL) {
ctx->currjob->funcargs = OPENSSL_malloc(size);
@@ -323,12 +323,11 @@ int ASYNC_init_thread(size_t max_size, size_t init_size)
return 0;
}
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) {
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
return 0;
- }
- if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) {
+
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC))
return 0;
- }
pool = OPENSSL_zalloc(sizeof(*pool));
if (pool == NULL) {
@@ -369,32 +368,41 @@ int ASYNC_init_thread(size_t max_size, size_t init_size)
return 1;
err:
- async_free_pool_internal(pool);
+ async_empty_pool(pool);
+ sk_ASYNC_JOB_free(pool->jobs);
+ OPENSSL_free(pool);
return 0;
}
-static void async_free_pool_internal(async_pool *pool)
+void async_delete_thread_state(void)
{
- if (pool == NULL)
- return;
+ async_pool *pool = (async_pool *)CRYPTO_THREAD_get_local(&poolkey);
- async_empty_pool(pool);
- sk_ASYNC_JOB_free(pool->jobs);
- OPENSSL_free(pool);
- CRYPTO_THREAD_set_local(&poolkey, NULL);
+ if (pool != NULL) {
+ async_empty_pool(pool);
+ sk_ASYNC_JOB_free(pool->jobs);
+ OPENSSL_free(pool);
+ CRYPTO_THREAD_set_local(&poolkey, NULL);
+ }
async_local_cleanup();
async_ctx_free();
}
void ASYNC_cleanup_thread(void)
{
- async_free_pool_internal((async_pool *)CRYPTO_THREAD_get_local(&poolkey));
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ async_delete_thread_state();
}
ASYNC_JOB *ASYNC_get_current_job(void)
{
async_ctx *ctx;
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return NULL;
+
ctx = async_get_ctx();
if (ctx == NULL)
return NULL;
@@ -409,7 +417,12 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job)
void ASYNC_block_pause(void)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ ctx = async_get_ctx();
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
@@ -421,7 +434,12 @@ void ASYNC_block_pause(void)
void ASYNC_unblock_pause(void)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ ctx = async_get_ctx();
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
diff --git a/crypto/include/internal/async.h b/crypto/include/internal/async.h
index db56258..747e0b8 100644
--- a/crypto/include/internal/async.h
+++ b/crypto/include/internal/async.h
@@ -11,4 +11,5 @@
int async_init(void);
void async_deinit(void);
+void async_delete_thread_state(void);
diff --git a/crypto/init.c b/crypto/init.c
index 5ed321f..4eb163e 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -365,9 +365,9 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals)
if (locals->async) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: "
- "ASYNC_cleanup_thread()\n");
+ "async_delete_thread_state()\n");
#endif
- ASYNC_cleanup_thread();
+ async_delete_thread_state();
}
if (locals->err_state) {
More information about the openssl-commits
mailing list