mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

kdf objects missing a return if malloc fails.

Browse Source 
I have searched through all references of ERR_R_MALLOC_FAILURE for any
other instances..

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18638)
This commit is contained in:
slontis 2022-06-23 13:10:55 +10:00 committed by Hugo Landau
parent d842b6eff0
commit 7260709e9e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/implementations/kdfs/tls1_prf.c
View File

@ -103,8 +103,10 @@ static void *kdf_tls1_prf_new(void *provctx)
if (!ossl_prov_is_running()) if (!ossl_prov_is_running())
return NULL; return NULL;
if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) {
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
return NULL;
}
ctx->provctx = provctx; ctx->provctx = provctx;
return ctx; return ctx;
} }

6
providers/implementations/kdfs/x942kdf.c
View File

@ -333,10 +333,12 @@ static void *x942kdf_new(void *provctx)
KDF_X942 *ctx; KDF_X942 *ctx;
if (!ossl_prov_is_running()) if (!ossl_prov_is_running())
return 0; return NULL;
if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) {
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
return NULL;
}
ctx->provctx = provctx; ctx->provctx = provctx;
ctx->use_keybits = 1; ctx->use_keybits = 1;
return ctx; return ctx;