diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2019-04-15 15:28:21 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-11-27 10:50:28 +0000 |
| commit | 9fb6d40eb3d4a2da8f45187de773498b784596e6 (patch) | |
| tree | e785ebfbe73b847146debb2dae4a4304c51aa9cf /src/plugins/crypto_ia32 | |
| parent | 99fbf0574f099f09b7b46dcabe5bb50d78091dce (diff) | |
misc: add address sanitizer heap instrumentation
Introduce AddressSanitizer support: https://github.com/google/sanitizers/
This starts with heap instrumentation. vlib_buffer, bihash and stack
instrumentation should follow.
Type: feature
Change-Id: I7f20e235b2f79db72efd0e756f22c75f717a9884
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'src/plugins/crypto_ia32')
| -rw-r--r-- | src/plugins/crypto_ia32/aes_gcm.c | 6 | ||||
| -rw-r--r-- | src/plugins/crypto_ia32/aesni.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/crypto_ia32/aes_gcm.c b/src/plugins/crypto_ia32/aes_gcm.c index c48ee8847b1..a21ecf3e6df 100644 --- a/src/plugins/crypto_ia32/aes_gcm.c +++ b/src/plugins/crypto_ia32/aes_gcm.c @@ -63,10 +63,12 @@ aesni_gcm_byte_mask (__m128i x, u8 n_bytes) static_always_inline __m128i aesni_gcm_load_partial (__m128i * p, int n_bytes) { + ASSERT (n_bytes <= 16); #ifdef __AVX512F__ return _mm_mask_loadu_epi8 (zero, (1 << n_bytes) - 1, p); #else - return aesni_gcm_byte_mask (_mm_loadu_si128 (p), n_bytes); + return aesni_gcm_byte_mask (CLIB_MEM_OVERFLOW_LOAD (_mm_loadu_si128, p), + n_bytes); #endif } @@ -591,7 +593,7 @@ aes_gcm (const u8 * in, u8 * out, const u8 * addt, const u8 * iv, u8 * tag, T = aesni_gcm_ghash (T, kd, (__m128i *) addt, aad_bytes); /* initalize counter */ - Y0 = _mm_loadu_si128 ((__m128i *) iv); + Y0 = CLIB_MEM_OVERFLOW_LOAD (_mm_loadu_si128, (__m128i *) iv); Y0 = _mm_insert_epi32 (Y0, clib_host_to_net_u32 (1), 3); /* ghash and encrypt/edcrypt */ diff --git a/src/plugins/crypto_ia32/aesni.h b/src/plugins/crypto_ia32/aesni.h index ceb28451732..ece61c13cf3 100644 --- a/src/plugins/crypto_ia32/aesni.h +++ b/src/plugins/crypto_ia32/aesni.h @@ -18,7 +18,6 @@ #ifndef __aesni_h__ #define __aesni_h__ - typedef enum { AESNI_KEY_128 = 0, @@ -77,7 +76,8 @@ aes192_key_expand (__m128i * k, u8 * key) __m128i r1, r2, r3; k[0] = r1 = _mm_loadu_si128 ((__m128i *) key); - r3 = _mm_loadu_si128 ((__m128i *) (key + 16)); + /* load the 24-bytes key as 2 * 16-bytes (and ignore last 8-bytes) */ + r3 = CLIB_MEM_OVERFLOW_LOAD (_mm_loadu_si128, (__m128i *) (key + 16)); k[1] = r3; r2 = _mm_aeskeygenassist_si128 (r3, 0x1); |