root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

crypto: raise error on malloc failure 

clean a few style nits.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14806)
This commit is contained in:
FdaSilvaYY 2018-03-28 23:15:38 +02:00 committed by Pauli
parent f691578bdc
commit 89947af2c5
7 changed files with 72 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/asn1/a_object.c
View File

@ -135,8 +135,10 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
OPENSSL_free(tmp); OPENSSL_free(tmp);
tmpsize = blsize + 32; tmpsize = blsize + 32;
tmp = OPENSSL_malloc(tmpsize); tmp = OPENSSL_malloc(tmpsize);
if (tmp == NULL) if (tmp == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
goto err; goto err;
}
} }
while (blsize--) { while (blsize--) {
BN_ULONG t = BN_div_word(bl, 0x80L); BN_ULONG t = BN_div_word(bl, 0x80L);

4
crypto/asn1/a_time.c
View File

@ -420,8 +420,10 @@ int ASN1_TIME_set_string_X509(ASN1_TIME *s, const char *str)
* new t.data would be freed after ASN1_STRING_copy is done. * new t.data would be freed after ASN1_STRING_copy is done.
*/ */
t.data = OPENSSL_zalloc(t.length + 1); t.data = OPENSSL_zalloc(t.length + 1);
if (t.data == NULL) if (t.data == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
goto out; goto out;
}
memcpy(t.data, str + 2, t.length); memcpy(t.data, str + 2, t.length);
t.type = V_ASN1_UTCTIME; t.type = V_ASN1_UTCTIME;
} }

10
crypto/asn1/ameth_lib.c
View File

@ -223,8 +223,10 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
{ {
EVP_PKEY_ASN1_METHOD *ameth = OPENSSL_zalloc(sizeof(*ameth)); EVP_PKEY_ASN1_METHOD *ameth = OPENSSL_zalloc(sizeof(*ameth));
if (ameth == NULL) if (ameth == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
}
ameth->pkey_id = id; ameth->pkey_id = id;
ameth->pkey_base_id = id; ameth->pkey_base_id = id;
@ -232,13 +234,13 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
if (info) { if (info) {
ameth->info = OPENSSL_strdup(info); ameth->info = OPENSSL_strdup(info);
if (!ameth->info) if (ameth->info == NULL)
goto err; goto err;
} }
if (pem_str) { if (pem_str) {
ameth->pem_str = OPENSSL_strdup(pem_str); ameth->pem_str = OPENSSL_strdup(pem_str);
if (!ameth->pem_str) if (ameth->pem_str == NULL)
goto err; goto err;
} }
@ -246,8 +248,8 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
err: err:
EVP_PKEY_asn1_free(ameth); EVP_PKEY_asn1_free(ameth);
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }
void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,

4
crypto/asn1/bio_asn1.c
View File

@ -102,8 +102,10 @@ static int asn1_bio_new(BIO *b)
{ {
BIO_ASN1_BUF_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); BIO_ASN1_BUF_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx));
if (ctx == NULL) if (ctx == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
return 0; return 0;
}
if (!asn1_bio_init(ctx, DEFAULT_ASN1_BUF_SIZE)) { if (!asn1_bio_init(ctx, DEFAULT_ASN1_BUF_SIZE)) {
OPENSSL_free(ctx); OPENSSL_free(ctx);
return 0; return 0;

19
crypto/asn1/tasn_enc.c
View File

@ -216,9 +216,9 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out, static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
const ASN1_TEMPLATE *tt, int tag, int iclass) const ASN1_TEMPLATE *tt, int tag, int iclass)
{ {
int i, ret, flags, ttag, tclass, ndef; const int flags = tt->flags;
int i, ret, ttag, tclass, ndef;
const ASN1_VALUE *tval; const ASN1_VALUE *tval;
flags = tt->flags;
/* /*
* If field is embedded then val needs fixing so it is a pointer to * If field is embedded then val needs fixing so it is a pointer to
@ -391,10 +391,11 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
int skcontlen, const ASN1_ITEM *item, int skcontlen, const ASN1_ITEM *item,
int do_sort, int iclass) int do_sort, int iclass)
{ {
int i; int i, ret = 0;
const ASN1_VALUE *skitem; const ASN1_VALUE *skitem;
unsigned char *tmpdat = NULL, *p = NULL; unsigned char *tmpdat = NULL, *p = NULL;
DER_ENC *derlst = NULL, *tder; DER_ENC *derlst = NULL, *tder;
if (do_sort) { if (do_sort) {
/* Don't need to sort less than 2 items */ /* Don't need to sort less than 2 items */
if (sk_const_ASN1_VALUE_num(sk) < 2) if (sk_const_ASN1_VALUE_num(sk) < 2)
@ -402,12 +403,14 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
else { else {
derlst = OPENSSL_malloc(sk_const_ASN1_VALUE_num(sk) derlst = OPENSSL_malloc(sk_const_ASN1_VALUE_num(sk)
* sizeof(*derlst)); * sizeof(*derlst));
if (derlst == NULL) if (derlst == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
return 0; return 0;
}
tmpdat = OPENSSL_malloc(skcontlen); tmpdat = OPENSSL_malloc(skcontlen);
if (tmpdat == NULL) { if (tmpdat == NULL) {
OPENSSL_free(derlst); ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
return 0; goto err;
} }
} }
} }
@ -443,9 +446,11 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
for (i = 0, tder = derlst; i < sk_const_ASN1_VALUE_num(sk); i++, tder++) for (i = 0, tder = derlst; i < sk_const_ASN1_VALUE_num(sk); i++, tder++)
(void)sk_const_ASN1_VALUE_set(sk, i, tder->field); (void)sk_const_ASN1_VALUE_set(sk, i, tder->field);
} }
ret = 1;
err:
OPENSSL_free(derlst); OPENSSL_free(derlst);
OPENSSL_free(tmpdat); OPENSSL_free(tmpdat);
return 1; return ret;
} }
static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out, static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,

52
crypto/bn/bn_gf2m.c
View File

@ -467,12 +467,17 @@ int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
{ {
int ret = 0; int ret = 0;
const int max = BN_num_bits(p) + 1; const int max = BN_num_bits(p) + 1;
int *arr = NULL; int *arr;
bn_check_top(a); bn_check_top(a);
bn_check_top(b); bn_check_top(b);
bn_check_top(p); bn_check_top(p);
if ((arr = OPENSSL_malloc(sizeof(*arr) * max)) == NULL)
goto err; arr = OPENSSL_malloc(sizeof(*arr) * max);
if (arr == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
return 0;
}
ret = BN_GF2m_poly2arr(p, arr, max); ret = BN_GF2m_poly2arr(p, arr, max);
if (!ret || ret > max) { if (!ret || ret > max) {
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH); ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
@ -525,12 +530,16 @@ int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
{ {
int ret = 0; int ret = 0;
const int max = BN_num_bits(p) + 1; const int max = BN_num_bits(p) + 1;
int *arr = NULL; int *arr;
bn_check_top(a); bn_check_top(a);
bn_check_top(p); bn_check_top(p);
if ((arr = OPENSSL_malloc(sizeof(*arr) * max)) == NULL)
goto err; arr = OPENSSL_malloc(sizeof(*arr) * max);
if (arr == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
return 0;
}
ret = BN_GF2m_poly2arr(p, arr, max); ret = BN_GF2m_poly2arr(p, arr, max);
if (!ret || ret > max) { if (!ret || ret > max) {
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH); ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
@ -899,12 +908,17 @@ int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
{ {
int ret = 0; int ret = 0;
const int max = BN_num_bits(p) + 1; const int max = BN_num_bits(p) + 1;
int *arr = NULL; int *arr;
bn_check_top(a); bn_check_top(a);
bn_check_top(b); bn_check_top(b);
bn_check_top(p); bn_check_top(p);
if ((arr = OPENSSL_malloc(sizeof(*arr) * max)) == NULL)
goto err; arr = OPENSSL_malloc(sizeof(*arr) * max);
if (arr == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
return 0;
}
ret = BN_GF2m_poly2arr(p, arr, max); ret = BN_GF2m_poly2arr(p, arr, max);
if (!ret || ret > max) { if (!ret || ret > max) {
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH); ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
@ -959,11 +973,16 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
{ {
int ret = 0; int ret = 0;
const int max = BN_num_bits(p) + 1; const int max = BN_num_bits(p) + 1;
int *arr = NULL; int *arr;
bn_check_top(a); bn_check_top(a);
bn_check_top(p); bn_check_top(p);
if ((arr = OPENSSL_malloc(sizeof(*arr) * max)) == NULL)
goto err; arr = OPENSSL_malloc(sizeof(*arr) * max);
if (arr == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
return 0;
}
ret = BN_GF2m_poly2arr(p, arr, max); ret = BN_GF2m_poly2arr(p, arr, max);
if (!ret || ret > max) { if (!ret || ret > max) {
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH); ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
@ -1090,11 +1109,16 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
{ {
int ret = 0; int ret = 0;
const int max = BN_num_bits(p) + 1; const int max = BN_num_bits(p) + 1;
int *arr = NULL; int *arr;
bn_check_top(a); bn_check_top(a);
bn_check_top(p); bn_check_top(p);
if ((arr = OPENSSL_malloc(sizeof(*arr) * max)) == NULL)
arr = OPENSSL_malloc(sizeof(*arr) * max);
if (arr == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
goto err; goto err;
}
ret = BN_GF2m_poly2arr(p, arr, max); ret = BN_GF2m_poly2arr(p, arr, max);
if (!ret || ret > max) { if (!ret || ret > max) {
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH); ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);

10
crypto/bn/bn_mod.c
View File

@ -56,9 +56,13 @@ int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
if (bn_wexpand(r, mtop) == NULL) if (bn_wexpand(r, mtop) == NULL)
return 0; return 0;
if (mtop > sizeof(storage) / sizeof(storage[0]) if (mtop > sizeof(storage) / sizeof(storage[0])) {
&& (tp = OPENSSL_malloc(mtop * sizeof(BN_ULONG))) == NULL) tp = OPENSSL_malloc(mtop * sizeof(BN_ULONG));
return 0; if (tp == NULL) {
ERR_raise(ERR_LIB_BN, ERR_R_MALLOC_FAILURE);
return 0;
}
}
ap = a->d != NULL ? a->d : tp; ap = a->d != NULL ? a->d : tp;
bp = b->d != NULL ? b->d : tp; bp = b->d != NULL ? b->d : tp;