update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / examples / fips_validation / fips_dev_self_test.c

diff --git a/ceph/src/spdk/dpdk/examples/fips_validation/fips_dev_self_test.c b/ceph/src/spdk/dpdk/examples/fips_validation/fips_dev_self_test.c
index df1c0e82e836ef5482ccae7883bc35e33ab7e81b..17e85973c044ed0cda9b14b43725fc08575ad6dc 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/fips_validation/fips_dev_self_test.c
+++ b/ceph/src/spdk/dpdk/examples/fips_validation/fips_dev_self_test.c
@@ -1333,6 +1333,9 @@ check_cipher_result(struct rte_crypto_op *op,
        uint32_t len, src_len;
        int ret;
 
+       if (!mbuf)
+               return -1;
+
        if (dir == self_test_dir_enc_auth_gen) {
                src = vec->output.data;
                src_len = vec->output.len;
@@ -1342,7 +1345,7 @@ check_cipher_result(struct rte_crypto_op *op,
        }
 
        GET_MBUF_DATA(data, len, mbuf);
-       if (!data && !len)
+       if (!len)
                return -1;
 
        ret = memcmp(data, src, src_len);
@@ -1362,8 +1365,11 @@ check_auth_result(struct rte_crypto_op *op,
        uint32_t len;
        int ret;
 
+       if (mbuf == NULL)
+               return -1;
+
        GET_MBUF_DATA(data, len, mbuf);
-       if (!data && !len)
+       if (!len)
                return -1;
 
        if (dir == self_test_dir_enc_auth_gen) {
@@ -1387,6 +1393,9 @@ check_aead_result(struct rte_crypto_op *op,
        uint32_t len, src_len;
        int ret;
 
+       if (!mbuf)
+               return -1;
+
        if (op->sym->aead.aad.data)
                rte_free(op->sym->aead.aad.data);
 
@@ -1399,7 +1408,7 @@ check_aead_result(struct rte_crypto_op *op,
        }
 
        GET_MBUF_DATA(data, len, mbuf);
-       if (!data && !len)
+       if (!len)
                return -1;
 
        ret = memcmp(data, src, src_len);
@@ -1548,12 +1557,16 @@ fips_dev_auto_test_uninit(uint8_t dev_id,
 static int
 fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
 {
-       struct rte_cryptodev_config conf = {rte_cryptodev_socket_id(dev_id), 1};
        struct rte_cryptodev_qp_conf qp_conf = {128, NULL, NULL};
        uint32_t sess_sz = rte_cryptodev_sym_get_private_session_size(dev_id);
+       struct rte_cryptodev_config conf;
        char name[128];
        int ret;
 
+       conf.socket_id = rte_cryptodev_socket_id(dev_id);
+       conf.nb_queue_pairs = 1;
+       conf.ff_disable = 0;
+
        ret = rte_cryptodev_configure(dev_id, &conf);
        if (ret < 0)
                return ret;