From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 2 Jul 2021 13:45:09 +0000 (+0200)
Subject: Coverity #1486687: fix potential dereference of NULL keymgmt
X-Git-Tag: openssl-3.0.0-beta2~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a02c81f8173e0c5d554bd16daa68b7594f4cbd8;p=thirdparty%2Fopenssl.git

Coverity #1486687: fix potential dereference of NULL keymgmt

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15986)
---

diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index 719bd17b2ff..edbea4face4 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -126,9 +126,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
         /* To allow it to be freed further down */
         if (!EVP_KEYMGMT_up_ref(keymgmt))
             return 0;
-    } else {
-        keymgmt = EVP_KEYMGMT_fetch(data->libctx,
-                                    data->object_type, data->propq);
+    } else if ((keymgmt = EVP_KEYMGMT_fetch(data->libctx,
+                                            data->object_type,
+                                            data->propq)) != NULL) {
         keymgmt_prov = EVP_KEYMGMT_get0_provider(keymgmt);
     }