From: Pauli <paul.dale@oracle.com>
Date: Mon, 9 Sep 2019 00:14:32 +0000 (+1000)
Subject: Coverity 1453629 and 1453638: Error handling issues (NEGATIVE_RETURNS)
X-Git-Tag: openssl-3.0.0-alpha1~1402
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a3dd6292385a23134e113a01463f9516004ae85;p=oweals%2Fopenssl.git

Coverity 1453629 and 1453638: Error handling issues (NEGATIVE_RETURNS)

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9805)
---

diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 29bd97bd1b..5d5efdbd69 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -470,6 +470,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
             goto err;
 
     j = BN_bn2binpad(ret, buf, num);
+    if (j < 0)
+        goto err;
 
     switch (padding) {
     case RSA_PKCS1_PADDING:
@@ -569,6 +571,8 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
             goto err;
 
     i = BN_bn2binpad(ret, buf, num);
+    if (i < 0)
+        goto err;
 
     switch (padding) {
     case RSA_PKCS1_PADDING: