summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLijian Zhang <Lijian.Zhang@arm.com>2019-09-27 16:25:35 +0800
committerAndrew Yourtchenko <ayourtch@gmail.com>2019-11-28 09:46:03 +0000
commit49cf46e0d0847796aecf7b62db961da416a5c9d7 (patch)
tree433d0c38720e28634c8990e1bab0e06354056df7
parentd2bff078647cd6382e25fe737bd93e0d36234240 (diff)
crypto: not use vec api with opt_data[VNET_CRYPTO_N_OP_IDS]
opt_data is defined as a array, while in some code, e.g., function vnet_crypto_get_op_type, it's used as vec. vec api is not applicable to static arraies. src/vnet/crypto/crypto.h:234:70: error: address of array 'cm->opt_data' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] vnet_crypto_op_data_t *od = ({ do { if ((0 > 0) && ! ((id) < ((cm->opt_data) ? (((vec_header_t *) (cm->opt_data) - 1)->len) : 0))) Type: fix Change-Id: I0b6754406e4216ca975bc1da4b5d4ce293a9bb45 Signed-off-by: Lijian Zhang <Lijian.Zhang@arm.com> (cherry picked from commit b15d796dbf1da6a229df4e10a3a2bdd700f0354e)
-rw-r--r--src/vnet/crypto/cli.c2
-rw-r--r--src/vnet/crypto/crypto.c2
-rw-r--r--src/vnet/crypto/crypto.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/vnet/crypto/cli.c b/src/vnet/crypto/cli.c
index 4b0e093b02e..8d523aec484 100644
--- a/src/vnet/crypto/cli.c
+++ b/src/vnet/crypto/cli.c
@@ -71,7 +71,7 @@ format_vnet_crypto_handlers (u8 * s, va_list * args)
if (id == 0)
continue;
- od = vec_elt_at_index (cm->opt_data, id);
+ od = cm->opt_data + id;
if (first == 0)
s = format (s, "\n%U", format_white_space, indent);
s = format (s, "%-20U%-20U", format_vnet_crypto_op_type, od->type,
diff --git a/src/vnet/crypto/crypto.c b/src/vnet/crypto/crypto.c
index 4a72b7cd116..6cd12108f6c 100644
--- a/src/vnet/crypto/crypto.c
+++ b/src/vnet/crypto/crypto.c
@@ -118,7 +118,7 @@ vnet_crypto_set_handler (char *alg_name, char *engine)
vnet_crypto_op_id_t id = ad->op_by_type[i];
if (id == 0)
continue;
- od = vec_elt_at_index (cm->opt_data, id);
+ od = cm->opt_data + id;
if (ce->ops_handlers[id])
{
od->active_engine_index = p[0];
diff --git a/src/vnet/crypto/crypto.h b/src/vnet/crypto/crypto.h
index 9326a078f8a..626e71d5030 100644
--- a/src/vnet/crypto/crypto.h
+++ b/src/vnet/crypto/crypto.h
@@ -231,7 +231,8 @@ static_always_inline vnet_crypto_op_type_t
vnet_crypto_get_op_type (vnet_crypto_op_id_t id)
{
vnet_crypto_main_t *cm = &crypto_main;
- vnet_crypto_op_data_t *od = vec_elt_at_index (cm->opt_data, id);
+ ASSERT (id < VNET_CRYPTO_N_OP_IDS);
+ vnet_crypto_op_data_t *od = cm->opt_data + id;
return od->type;
}