diff options
| author | Matt Caswell <matt@openssl.org> | 2020-06-26 11:00:25 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-06-28 10:55:52 +0200 |
| commit | 6c689e58f70726cfa5533bc10f9669abce199fb8 (patch) | |
| tree | 102c08ba61faae7e9838b0f2481dc188227b2b20 /crypto/async | |
| parent | cfbd76c1a9737617d4cf90d3a1af704241c97d98 (diff) | |
Make the ASYNC code default libctx aware
Since the default libctx is now stored in a thread local variable
swapping in and out of fibres in the ASYNC code could mean that the
"current" default libctx can get confused. Therefore we ensure that
everytime we call async_fibre_swapcontext() we always restore the default
libctx to whatever it was the last time the fibre ran. Similarly when
async_fibre_swapcontext() returns we need to restore the current thread's
default libctx.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12228)
Diffstat (limited to 'crypto/async')
| -rw-r--r-- | crypto/async/async.c | 18 | ||||
| -rw-r--r-- | crypto/async/async_local.h | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/crypto/async/async.c b/crypto/async/async.c index 312f47325b..b985505309 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -170,6 +170,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, int (*func)(void *), void *args, size_t size) { async_ctx *ctx; + OPENSSL_CTX *libctx; if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) return ASYNC_ERR; @@ -203,6 +204,11 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, if (ctx->currjob->status == ASYNC_JOB_PAUSED) { ctx->currjob = *job; + /* + * Restore the default libctx to what it was the last time the + * fibre ran + */ + libctx = OPENSSL_CTX_set0_default(ctx->currjob->libctx); /* Resume previous job */ if (!async_fibre_swapcontext(&ctx->dispatcher, &ctx->currjob->fibrectx, 1)) { @@ -210,6 +216,12 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, ASYNC_R_FAILED_TO_SWAP_CONTEXT); goto err; } + /* + * In case the fibre changed the default libctx we set it back + * again to what it was originally, and remember what it had + * been changed to. + */ + ctx->currjob->libctx = OPENSSL_CTX_set0_default(libctx); continue; } @@ -240,11 +252,17 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, ctx->currjob->func = func; ctx->currjob->waitctx = wctx; + libctx = openssl_ctx_get_concrete(NULL); if (!async_fibre_swapcontext(&ctx->dispatcher, &ctx->currjob->fibrectx, 1)) { ASYNCerr(ASYNC_F_ASYNC_START_JOB, ASYNC_R_FAILED_TO_SWAP_CONTEXT); goto err; } + /* + * In case the fibre changed the default libctx we set it back again + * to what it was, and remember what it had been changed to. + */ + ctx->currjob->libctx = OPENSSL_CTX_set0_default(libctx); } err: diff --git a/crypto/async/async_local.h b/crypto/async/async_local.h index 549a27e611..f2f0a56186 100644 --- a/crypto/async/async_local.h +++ b/crypto/async/async_local.h @@ -43,6 +43,7 @@ struct async_job_st { int ret; int status; ASYNC_WAIT_CTX *waitctx; + OPENSSL_CTX *libctx; }; struct fd_lookup_st { |