Skip to content

Commit

Permalink
vhost/crypto: fix inferred misuse of enum
Browse files Browse the repository at this point in the history 
[ upstream commit 4349d41 ]

This patch fixes the inferred misuse of enum of crypto algorithms.

Coverity issue: 325879
Fixes: e80a987 ("vhost/crypto: add session message handler")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Marko Kovacevic <marko.kovacevic@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
  • Loading branch information
@kevintraynor
Fan Zhang authored and kevintraynor committed Jun 24, 2019
1 parent 9a0e607 commit 6676ee0
Showing 1 changed file with 41 additions and 52 deletions.
93 changes: 41 additions & 52 deletions lib/librte_vhost/vhost_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,116 +46,107 @@
((t)(uintptr_t)vhost_iova_to_vva(r->dev, r->vq, a, l, p))

static int
cipher_algo_transform(uint32_t virtio_cipher_algo)
cipher_algo_transform(uint32_t virtio_cipher_algo,
enum rte_crypto_cipher_algorithm *algo)
{
int ret;

switch (virtio_cipher_algo) {
case VIRTIO_CRYPTO_CIPHER_AES_CBC:
ret = RTE_CRYPTO_CIPHER_AES_CBC;
*algo = RTE_CRYPTO_CIPHER_AES_CBC;
break;
case VIRTIO_CRYPTO_CIPHER_AES_CTR:
ret = RTE_CRYPTO_CIPHER_AES_CTR;
*algo = RTE_CRYPTO_CIPHER_AES_CTR;
break;
case VIRTIO_CRYPTO_CIPHER_DES_ECB:
ret = -VIRTIO_CRYPTO_NOTSUPP;
*algo = -VIRTIO_CRYPTO_NOTSUPP;
break;
case VIRTIO_CRYPTO_CIPHER_DES_CBC:
ret = RTE_CRYPTO_CIPHER_DES_CBC;
*algo = RTE_CRYPTO_CIPHER_DES_CBC;
break;
case VIRTIO_CRYPTO_CIPHER_3DES_ECB:
ret = RTE_CRYPTO_CIPHER_3DES_ECB;
*algo = RTE_CRYPTO_CIPHER_3DES_ECB;
break;
case VIRTIO_CRYPTO_CIPHER_3DES_CBC:
ret = RTE_CRYPTO_CIPHER_3DES_CBC;
*algo = RTE_CRYPTO_CIPHER_3DES_CBC;
break;
case VIRTIO_CRYPTO_CIPHER_3DES_CTR:
ret = RTE_CRYPTO_CIPHER_3DES_CTR;
*algo = RTE_CRYPTO_CIPHER_3DES_CTR;
break;
case VIRTIO_CRYPTO_CIPHER_KASUMI_F8:
ret = RTE_CRYPTO_CIPHER_KASUMI_F8;
*algo = RTE_CRYPTO_CIPHER_KASUMI_F8;
break;
case VIRTIO_CRYPTO_CIPHER_SNOW3G_UEA2:
ret = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
*algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
break;
case VIRTIO_CRYPTO_CIPHER_AES_F8:
ret = RTE_CRYPTO_CIPHER_AES_F8;
*algo = RTE_CRYPTO_CIPHER_AES_F8;
break;
case VIRTIO_CRYPTO_CIPHER_AES_XTS:
ret = RTE_CRYPTO_CIPHER_AES_XTS;
*algo = RTE_CRYPTO_CIPHER_AES_XTS;
break;
case VIRTIO_CRYPTO_CIPHER_ZUC_EEA3:
ret = RTE_CRYPTO_CIPHER_ZUC_EEA3;
*algo = RTE_CRYPTO_CIPHER_ZUC_EEA3;
break;
default:
ret = -VIRTIO_CRYPTO_BADMSG;
return -VIRTIO_CRYPTO_BADMSG;
break;
}

return ret;
return 0;
}

static int
auth_algo_transform(uint32_t virtio_auth_algo)
auth_algo_transform(uint32_t virtio_auth_algo,
enum rte_crypto_auth_algorithm *algo)
{
int ret;

switch (virtio_auth_algo) {

case VIRTIO_CRYPTO_NO_MAC:
ret = RTE_CRYPTO_AUTH_NULL;
*algo = RTE_CRYPTO_AUTH_NULL;
break;
case VIRTIO_CRYPTO_MAC_HMAC_MD5:
ret = RTE_CRYPTO_AUTH_MD5_HMAC;
*algo = RTE_CRYPTO_AUTH_MD5_HMAC;
break;
case VIRTIO_CRYPTO_MAC_HMAC_SHA1:
ret = RTE_CRYPTO_AUTH_SHA1_HMAC;
*algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
break;
case VIRTIO_CRYPTO_MAC_HMAC_SHA_224:
ret = RTE_CRYPTO_AUTH_SHA224_HMAC;
*algo = RTE_CRYPTO_AUTH_SHA224_HMAC;
break;
case VIRTIO_CRYPTO_MAC_HMAC_SHA_256:
ret = RTE_CRYPTO_AUTH_SHA256_HMAC;
*algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
break;
case VIRTIO_CRYPTO_MAC_HMAC_SHA_384:
ret = RTE_CRYPTO_AUTH_SHA384_HMAC;
*algo = RTE_CRYPTO_AUTH_SHA384_HMAC;
break;
case VIRTIO_CRYPTO_MAC_HMAC_SHA_512:
ret = RTE_CRYPTO_AUTH_SHA512_HMAC;
break;
case VIRTIO_CRYPTO_MAC_CMAC_3DES:
ret = -VIRTIO_CRYPTO_NOTSUPP;
*algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
break;
case VIRTIO_CRYPTO_MAC_CMAC_AES:
ret = RTE_CRYPTO_AUTH_AES_CMAC;
*algo = RTE_CRYPTO_AUTH_AES_CMAC;
break;
case VIRTIO_CRYPTO_MAC_KASUMI_F9:
ret = RTE_CRYPTO_AUTH_KASUMI_F9;
*algo = RTE_CRYPTO_AUTH_KASUMI_F9;
break;
case VIRTIO_CRYPTO_MAC_SNOW3G_UIA2:
ret = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
*algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
break;
case VIRTIO_CRYPTO_MAC_GMAC_AES:
ret = RTE_CRYPTO_AUTH_AES_GMAC;
break;
case VIRTIO_CRYPTO_MAC_GMAC_TWOFISH:
ret = -VIRTIO_CRYPTO_NOTSUPP;
*algo = RTE_CRYPTO_AUTH_AES_GMAC;
break;
case VIRTIO_CRYPTO_MAC_CBCMAC_AES:
ret = RTE_CRYPTO_AUTH_AES_CBC_MAC;
break;
case VIRTIO_CRYPTO_MAC_CBCMAC_KASUMI_F9:
ret = -VIRTIO_CRYPTO_NOTSUPP;
*algo = RTE_CRYPTO_AUTH_AES_CBC_MAC;
break;
case VIRTIO_CRYPTO_MAC_XCBC_AES:
ret = RTE_CRYPTO_AUTH_AES_XCBC_MAC;
*algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC;
break;
case VIRTIO_CRYPTO_MAC_CMAC_3DES:
case VIRTIO_CRYPTO_MAC_GMAC_TWOFISH:
case VIRTIO_CRYPTO_MAC_CBCMAC_KASUMI_F9:
return -VIRTIO_CRYPTO_NOTSUPP;
default:
ret = -VIRTIO_CRYPTO_BADMSG;
break;
return -VIRTIO_CRYPTO_BADMSG;
}

return ret;
return 0;
}

static int get_iv_len(enum rte_crypto_cipher_algorithm algo)
Expand Down Expand Up @@ -241,12 +232,11 @@ transform_cipher_param(struct rte_crypto_sym_xform *xform,
{
int ret;

ret = cipher_algo_transform(param->cipher_algo);
ret = cipher_algo_transform(param->cipher_algo, &xform->cipher.algo);
if (unlikely(ret < 0))
return ret;

xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
xform->cipher.algo = (enum rte_crypto_cipher_algorithm)ret;
xform->cipher.key.length = param->cipher_key_len;
if (xform->cipher.key.length > 0)
xform->cipher.key.data = param->cipher_key_buf;
Expand Down Expand Up @@ -292,11 +282,11 @@ transform_chain_param(struct rte_crypto_sym_xform *xforms,
}

/* cipher */
ret = cipher_algo_transform(param->cipher_algo);
ret = cipher_algo_transform(param->cipher_algo,
&xform_cipher->cipher.algo);
if (unlikely(ret < 0))
return ret;
xform_cipher->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
xform_cipher->cipher.algo = (enum rte_crypto_cipher_algorithm)ret;
xform_cipher->cipher.key.length = param->cipher_key_len;
xform_cipher->cipher.key.data = param->cipher_key_buf;
ret = get_iv_len(xform_cipher->cipher.algo);
Expand All @@ -307,10 +297,9 @@ transform_chain_param(struct rte_crypto_sym_xform *xforms,

/* auth */
xform_auth->type = RTE_CRYPTO_SYM_XFORM_AUTH;
ret = auth_algo_transform(param->hash_algo);
ret = auth_algo_transform(param->hash_algo, &xform_auth->auth.algo);
if (unlikely(ret < 0))
return ret;
xform_auth->auth.algo = (enum rte_crypto_auth_algorithm)ret;
xform_auth->auth.digest_length = param->digest_len;
xform_auth->auth.key.length = param->auth_key_len;
xform_auth->auth.key.data = param->auth_key_buf;
Expand Down

0 comments on commit 6676ee0

Please sign in to comment.