diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-01 23:10:31 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-04 15:00:13 -0400 |
| commit | b4faea50c35d92a67d1369355b49cc3efba78406 (patch) | |
| tree | cfebea69d625f936c9fd7281f1fa3eaa2fa38834 /crypto/engine | |
| parent | 8920a7cd04f43b1a090d0b0a8c9e16b94c6898d4 (diff) | |
| download | openssl-b4faea50c35d92a67d1369355b49cc3efba78406.zip openssl-b4faea50c35d92a67d1369355b49cc3efba78406.tar.gz openssl-b4faea50c35d92a67d1369355b49cc3efba78406.tar.bz2 | |
Use safer sizeof variant in malloc
For a local variable:
TYPE *p;
Allocations like this are "risky":
p = OPENSSL_malloc(sizeof(TYPE));
if the type of p changes, and the malloc call isn't updated, you
could get memory corruption. Instead do this:
p = OPENSSL_malloc(sizeof(*p));
Also fixed a few memset() calls that I noticed while doing this.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_dyn.c | 4 | ||||
| -rw-r--r-- | crypto/engine/eng_lib.c | 4 | ||||
| -rw-r--r-- | crypto/engine/eng_openssl.c | 2 | ||||
| -rw-r--r-- | crypto/engine/eng_table.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 84d8e86..ed1c220 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -202,8 +202,8 @@ static void dynamic_data_ctx_free_func(void *parent, void *ptr, */ static int dynamic_set_data_ctx(ENGINE *e, dynamic_data_ctx **ctx) { - dynamic_data_ctx *c; - c = OPENSSL_malloc(sizeof(dynamic_data_ctx)); + dynamic_data_ctx *c = OPENSSL_malloc(sizeof(*c)); + if (!c) { ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX, ERR_R_MALLOC_FAILURE); return 0; diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c index 64b0cad..3bf06bb 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -66,7 +66,7 @@ ENGINE *ENGINE_new(void) { ENGINE *ret; - ret = OPENSSL_malloc(sizeof(ENGINE)); + ret = OPENSSL_malloc(sizeof(*ret)); if (ret == NULL) { ENGINEerr(ENGINE_F_ENGINE_NEW, ERR_R_MALLOC_FAILURE); return NULL; @@ -163,7 +163,7 @@ static int int_cleanup_check(int create) static ENGINE_CLEANUP_ITEM *int_cleanup_item(ENGINE_CLEANUP_CB *cb) { - ENGINE_CLEANUP_ITEM *item = OPENSSL_malloc(sizeof(ENGINE_CLEANUP_ITEM)); + ENGINE_CLEANUP_ITEM *item = OPENSSL_malloc(sizeof(*item)); if (!item) return NULL; item->cb = cb; diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index cc91044..e9bdd01 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -425,7 +425,7 @@ typedef struct { static int ossl_hmac_init(EVP_PKEY_CTX *ctx) { OSSL_HMAC_PKEY_CTX *hctx; - hctx = OPENSSL_malloc(sizeof(OSSL_HMAC_PKEY_CTX)); + hctx = OPENSSL_malloc(sizeof(*hctx)); if (!hctx) return 0; hctx->md = NULL; diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 16eb771..f0f4dbb 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -147,7 +147,7 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, tmplate.nid = *nids; fnd = lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate); if (!fnd) { - fnd = OPENSSL_malloc(sizeof(ENGINE_PILE)); + fnd = OPENSSL_malloc(sizeof(*fnd)); if (!fnd) goto end; fnd->uptodate = 1; |