diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2019-04-29 17:27:24 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-10-31 12:15:33 +0000 |
| commit | 952d4e7fb9fce28c36f8ff05a0a20ce528aa45f7 (patch) | |
| tree | c76ec8df2b84be3fae505baa8b840cb8aa6b35a6 | |
| parent | 54ff70cb3c27733a9c09ab7c2ea0a6fd69e7ea02 (diff) | |
vppinfra: add clib_mem_free_s
IPsec zero-es all allocated key memory including memory sur-allocated by
the allocator.
Move it to its own function in clib mem infra to make it easier to
instrument.
Type: refactor
Change-Id: Icd1c44d18b741e723864abce75ac93e2eff74b61
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 78af0a8c5ff1a33ff8dccb1b2ea6ffadb8ef7b62)
| -rw-r--r-- | src/plugins/crypto_ia32/main.c | 8 | ||||
| -rw-r--r-- | src/plugins/crypto_ipsecmb/ipsecmb.c | 8 | ||||
| -rw-r--r-- | src/vppinfra/mem.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/crypto_ia32/main.c b/src/plugins/crypto_ia32/main.c index cca5fb4cf64..194182fd57a 100644 --- a/src/plugins/crypto_ia32/main.c +++ b/src/plugins/crypto_ia32/main.c @@ -40,9 +40,7 @@ crypto_ia32_key_handler (vlib_main_t * vm, vnet_crypto_key_op_t kop, if (cm->key_data[idx] == 0) return; - clib_memset_u8 (cm->key_data[idx], 0, - clib_mem_size (cm->key_data[idx])); - clib_mem_free (cm->key_data[idx]); + clib_mem_free_s (cm->key_data[idx]); cm->key_data[idx] = 0; return; } @@ -51,9 +49,7 @@ crypto_ia32_key_handler (vlib_main_t * vm, vnet_crypto_key_op_t kop, if (kop == VNET_CRYPTO_KEY_OP_MODIFY && cm->key_data[idx]) { - clib_memset_u8 (cm->key_data[idx], 0, - clib_mem_size (cm->key_data[idx])); - clib_mem_free (cm->key_data[idx]); + clib_mem_free_s (cm->key_data[idx]); } cm->key_data[idx] = cm->key_fn[key->alg] (key); diff --git a/src/plugins/crypto_ipsecmb/ipsecmb.c b/src/plugins/crypto_ipsecmb/ipsecmb.c index fccc697cba3..7428e99171f 100644 --- a/src/plugins/crypto_ipsecmb/ipsecmb.c +++ b/src/plugins/crypto_ipsecmb/ipsecmb.c @@ -402,9 +402,7 @@ crypto_ipsecmb_key_handler (vlib_main_t * vm, vnet_crypto_key_op_t kop, if (imbm->key_data[idx] == 0) return; - clib_memset_u8 (imbm->key_data[idx], 0, - clib_mem_size (imbm->key_data[idx])); - clib_mem_free (imbm->key_data[idx]); + clib_mem_free_s (imbm->key_data[idx]); imbm->key_data[idx] = 0; return; } @@ -416,9 +414,7 @@ crypto_ipsecmb_key_handler (vlib_main_t * vm, vnet_crypto_key_op_t kop, if (kop == VNET_CRYPTO_KEY_OP_MODIFY && imbm->key_data[idx]) { - clib_memset_u8 (imbm->key_data[idx], 0, - clib_mem_size (imbm->key_data[idx])); - clib_mem_free (imbm->key_data[idx]); + clib_mem_free_s (imbm->key_data[idx]); } kd = imbm->key_data[idx] = clib_mem_alloc_aligned (ad->data_size, diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h index f2930a11253..e565757ed3e 100644 --- a/src/vppinfra/mem.h +++ b/src/vppinfra/mem.h @@ -272,6 +272,14 @@ clib_mem_size (void *p) #endif } +always_inline void +clib_mem_free_s (void *p) +{ + uword size = clib_mem_size (p); + memset_s_inline (p, size, 0, size); + clib_mem_free (p); +} + always_inline void * clib_mem_get_heap (void) { |