From: Pauli <ppzgs1@gmail.com>
Date: Thu, 18 Mar 2021 23:40:05 +0000 (+1000)
Subject: evp: fix coverity 1467500 & 1467502: unchecked return values
X-Git-Tag: openssl-3.0.0-alpha14~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40d6e05cf8075e1f37aeb5ea1b49f47896f951fa;p=thirdparty%2Fopenssl.git

evp: fix coverity 1467500 & 1467502: unchecked return values

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14615)
---

diff --git a/crypto/evp/p_legacy.c b/crypto/evp/p_legacy.c
index af93288dcb3..c1d813f047f 100644
--- a/crypto/evp/p_legacy.c
+++ b/crypto/evp/p_legacy.c
@@ -57,11 +57,13 @@ RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
 #ifndef OPENSSL_NO_EC
 int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
 {
-    int ret = EVP_PKEY_assign_EC_KEY(pkey, key);
-
-    if (ret)
-        EC_KEY_up_ref(key);
-    return ret;
+    if (!EC_KEY_up_ref(key))
+        return 0;
+    if (!EVP_PKEY_assign_EC_KEY(pkey, key)) {
+        EC_KEY_free(key);
+        return 0;
+    }
+    return 1;
 }
 
 EC_KEY *evp_pkey_get0_EC_KEY_int(const EVP_PKEY *pkey)
@@ -82,8 +84,8 @@ EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
 {
     EC_KEY *ret = evp_pkey_get0_EC_KEY_int(pkey);
 
-    if (ret != NULL)
-        EC_KEY_up_ref(ret);
+    if (ret != NULL && !EC_KEY_up_ref(ret))
+        ret = NULL;
     return ret;
 }
 #endif /* OPENSSL_NO_EC */