Fix a failure to NULL a pointer freed on error.

Reported by the LibreSSL project as a follow on to CVE-2015-0209

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index f487dbbc3a466ffadab0161fc879a529a1703558..36f6ff4362c7b1af3f282ad6b22fc37b6f37eb5c 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -168,8 +168,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
     const unsigned char *q;
     X509 *ret;
 {
     const unsigned char *q;
     X509 *ret;

+    int freeret = 0;
+

     /* Save start position */
     q = *pp;
     /* Save start position */
     q = *pp;

+
+    if(!a || *a == NULL) {
+        freeret = 1;
+    }

     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)
     ret = d2i_X509(a, pp, length);
     /* If certificate unreadable then forget it */
     if (!ret)


@@ -182,7 +188,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
         goto err;
     return ret;
  err:

-    X509_free(ret);
+    if(freeret) {
+        X509_free(ret);
+        if (a)
+            *a = NULL;
+    }

     return NULL;
 }
 
     return NULL;
 }
 

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6ff94a356362e99d755efef3935f523377b23cdf..b4b0e9f3b82a2bde381978071d385eb4bd9bc4f0 100644 (file)
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -1226,16 +1226,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }
             ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
             return NULL;
         }

-        if (a)
-            *a = ret;

     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
     } else
         ret = *a;
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);

+        if (a == NULL || *a != ret)
+             EC_KEY_free(ret);

         return NULL;
     }
 
         return NULL;
     }
 

+    if (a)
+        *a = ret;
+

     return ret;
 }
 
     return ret;
 }