generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a failure to NULL a pointer freed on error.

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

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-03-19 10:16:32 +00:00
parent 6655ac4e45
commit c380bff888
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/asn1/x_x509.c
View File

@ -179,8 +179,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
{ {
const unsigned char *q; const unsigned char *q;
X509 *ret; X509 *ret;
int freeret = 0;
/* Save start position */ /* Save start position */
q = *pp; q = *pp;
if(!a || *a == NULL) {
freeret = 1;
}
ret = d2i_X509(a, pp, length); ret = d2i_X509(a, pp, length);
/* If certificate unreadable then forget it */ /* If certificate unreadable then forget it */
if (!ret) if (!ret)
@ -193,7 +199,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
goto err; goto err;
return ret; return ret;
err: err:
X509_free(ret); if(freeret) {
X509_free(ret);
if (a)
*a = NULL;
}
return NULL; return NULL;
} }

7
crypto/ec/ec_asn1.c
View File

@ -1196,16 +1196,19 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE); ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }
if (a)
*a = ret;
} else } else
ret = *a; ret = *a;
if (!d2i_ECPKParameters(&ret->group, in, len)) { if (!d2i_ECPKParameters(&ret->group, in, len)) {
ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB); 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;
} }