From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 18 Mar 2021 12:04:30 +0000 (+0100)
Subject: ASYNC_start_job: Reset libctx when async_fibre_swapcontext fails
X-Git-Tag: openssl-3.0.0-alpha14~209
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03cd9d2f230fd60af23ed5ccbe8c6e8ad245cd73;p=thirdparty%2Fopenssl.git

ASYNC_start_job: Reset libctx when async_fibre_swapcontext fails

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14605)
---

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;
                 }