ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: coverity issues

Browse Source 
Change-Id: I9db1b74097c9df587b9265b14a969d347bcb731a
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2019-04-05 11:11:04 +02:00
committed by Dave Wallace
parent c42c7f08f5
commit ba01f07631
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/crypto_ia32/aes_cbc.c
View File

@@ -95,10 +95,12 @@ aesni_ops_enc_aes_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[],
vm->thread_index);
int rounds = AESNI_KEY_ROUNDS (ks);
u8 dummy[8192];
u8 *src[4], *dst[4], *key[4];
u8 *src[4] = { };
u8 *dst[4] = { };
u8 *key[4] = { };
u32x4 dummy_mask, len = { };
u32 i, j, count, n_left = n_ops;
__m128i r[4], k[4][rounds + 1];
__m128i r[4] = { }, k[4][rounds + 1];
more:
for (i = 0; i < 4; i++)
@@ -187,22 +189,30 @@ aesni_ops_dec_aes_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[],
u32 n_ops, aesni_key_size_t ks)
{
int rounds = AESNI_KEY_ROUNDS (ks);
u8 *last_key = 0;
u32 i;
vnet_crypto_op_t *op = ops[0];
u32 n_left = n_ops;
u8 *last_key;
__m128i k[rounds + 1];
for (i = 0; i < n_ops; i++)
{
vnet_crypto_op_t *op = ops[i];
if (last_key != op->key)
{
aes_key_expand (k, op->key, ks);
ASSERT (n_ops >= 1);
key_expand:
last_key = op->key;
aes_key_enc_to_dec (k, rounds);
}
aes_key_expand (k, op->key, ks);
aes_key_enc_to_dec (k, ks);
decrypt:
aes_cbc_dec (k, op->src, op->dst, op->iv, op->len, rounds);
op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
if (--n_left)
{
op += 1;
if (last_key != op->key)
goto key_expand;
goto decrypt;
}
return n_ops;
}
@@ -237,7 +247,8 @@ crypto_ia32_aesni_cbc_init (vlib_main_t * vm)
{
for (int i = 0; i < 4; i++)
{
if (read(fd, ptd->cbc_iv, sizeof (ptd->cbc_iv)) < 0)
if (read(fd, ptd->cbc_iv, sizeof (ptd->cbc_iv)) !=
sizeof (ptd->cbc_iv))
{
err = clib_error_return_unix (0, "'/dev/urandom' read failure");
goto error;

3
src/plugins/crypto_ia32/aesni.h
View File

@@ -195,8 +195,9 @@ aes_key_expand (__m128i * k, u8 * key, aesni_key_size_t ks)
static_always_inline void
aes_key_enc_to_dec (__m128i * k, aesni_key_size_t rounds)
aes_key_enc_to_dec (__m128i * k, aesni_key_size_t ks)
{
int rounds = AESNI_KEY_ROUNDS (ks);
__m128i r;
r = k[rounds];

2
src/vnet/crypto/crypto.c
View File

@@ -30,7 +30,7 @@ vnet_crypto_process_ops_call_handler (vlib_main_t * vm,
if (cm->ops_handlers[opt] == 0)
{
while (n_ops)
while (n_ops--)
{
ops[0]->status = VNET_CRYPTO_OP_STATUS_FAIL_NO_HANDLER;
ops++;