From 03cd9d2f230fd60af23ed5ccbe8c6e8ad245cd73 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 18 Mar 2021 13:04:30 +0100 Subject: [PATCH] ASYNC_start_job: Reset libctx when async_fibre_swapcontext fails Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/14605) --- crypto/async/async.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crypto/async/async.c b/crypto/async/async.c index 963d969d982..2a51ee7bc2b 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -209,9 +209,15 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, * fibre ran */ libctx = OSSL_LIB_CTX_set0_default(ctx->currjob->libctx); + if (libctx == NULL) { + /* Failed to set the default context */ + ERR_raise(ERR_LIB_ASYNC, ERR_R_INTERNAL_ERROR); + goto err; + } /* Resume previous job */ if (!async_fibre_swapcontext(&ctx->dispatcher, &ctx->currjob->fibrectx, 1)) { + ctx->currjob->libctx = OSSL_LIB_CTX_set0_default(libctx); ERR_raise(ERR_LIB_ASYNC, ASYNC_R_FAILED_TO_SWAP_CONTEXT); goto err; } -- 2.47.2