crypto/aesni_mb: fix out-of-bounds access

[dpdk.git] / drivers / crypto / aesni_mb / rte_aesni_mb_pmd_private.h

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
index d61abfe..b794d4b 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
@@ -7,21 +7,6 @@
 
 #include <intel-ipsec-mb.h>
 
-
-/*
- * IMB_VERSION_NUM macro was introduced in version Multi-buffer 0.50,
- * so if macro is not defined, it means that the version is 0.49.
- */
-#if !defined(IMB_VERSION_NUM)
-#define IMB_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define IMB_VERSION_NUM IMB_VERSION(0, 49, 0)
-#endif
-
-#if IMB_VERSION_NUM < IMB_VERSION(0, 52, 0)
-#include "aesni_mb_ops.h"
-#endif
-
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
 enum aesni_mb_vector_mode {
        RTE_AESNI_MB_NOT_SUPPORTED = 0,
        RTE_AESNI_MB_SSE,
@@ -29,8 +14,6 @@ enum aesni_mb_vector_mode {
        RTE_AESNI_MB_AVX2,
        RTE_AESNI_MB_AVX512
 };
-#endif
-
 
 #define CRYPTODEV_NAME_AESNI_MB_PMD    crypto_aesni_mb
 /**< AES-NI Multi buffer PMD device name */
@@ -50,6 +33,7 @@ int aesni_mb_logtype_driver;
 /* Maximum length for digest */
 #define DIGEST_LENGTH_MAX 64
 static const unsigned auth_blocksize[] = {
+               [NULL_HASH]     = 0,
                [MD5]           = 64,
                [SHA1]          = 64,
                [SHA_224]       = 64,
@@ -58,6 +42,13 @@ static const unsigned auth_blocksize[] = {
                [SHA_512]       = 128,
                [AES_XCBC]      = 16,
                [AES_CCM]       = 16,
+               [AES_CMAC]      = 16,
+               [AES_GMAC]      = 16,
+               [PLAIN_SHA1]    = 64,
+               [PLAIN_SHA_224] = 64,
+               [PLAIN_SHA_256] = 64,
+               [PLAIN_SHA_384] = 128,
+               [PLAIN_SHA_512] = 128
 };
 
 /**
@@ -82,7 +73,13 @@ static const unsigned auth_truncated_digest_byte_lengths[] = {
                [AES_XCBC]      = 12,
                [AES_CMAC]      = 12,
                [AES_CCM]       = 8,
-               [NULL_HASH]     = 0
+               [NULL_HASH]     = 0,
+               [AES_GMAC]      = 16,
+               [PLAIN_SHA1]    = 20,
+               [PLAIN_SHA_224] = 28,
+               [PLAIN_SHA_256] = 32,
+               [PLAIN_SHA_384] = 48,
+               [PLAIN_SHA_512] = 64
 };
 
 /**
@@ -107,8 +104,14 @@ static const unsigned auth_digest_byte_lengths[] = {
                [SHA_512]       = 64,
                [AES_XCBC]      = 16,
                [AES_CMAC]      = 16,
+               [AES_CCM]       = 16,
                [AES_GMAC]      = 12,
                [NULL_HASH]     = 0,
+               [PLAIN_SHA1]    = 20,
+               [PLAIN_SHA_224] = 28,
+               [PLAIN_SHA_256] = 32,
+               [PLAIN_SHA_384] = 48,
+               [PLAIN_SHA_512] = 64
        /**< Vector mode dependent pointer table of the multi-buffer APIs */
 
 };
@@ -142,10 +145,8 @@ struct aesni_mb_private {
        /**< CPU vector instruction set mode */
        unsigned max_nb_queue_pairs;
        /**< Max number of queue pairs supported by device */
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
        MB_MGR *mb_mgr;
        /**< Multi-buffer instance */
-#endif
 };
 
 /** AESNI Multi buffer queue pair */
@@ -153,10 +154,6 @@ struct aesni_mb_qp {
        uint16_t id;
        /**< Queue Pair Identifier */
        char name[RTE_CRYPTODEV_NAME_MAX_LEN];
-#if IMB_VERSION_NUM < IMB_VERSION(0, 52, 0)
-       /**< Unique Queue Pair Name */
-       const struct aesni_mb_op_fns *op_fns;
-#endif
        /**< Unique Queue Pair Name */
        MB_MGR *mb_mgr;
        /**< Multi-buffer instance */
@@ -164,6 +161,8 @@ struct aesni_mb_qp {
        /**< Ring for placing operations ready for processing */
        struct rte_mempool *sess_mp;
        /**< Session Mempool */
+       struct rte_mempool *sess_mp_priv;
+       /**< Session Private Data Mempool */
        struct rte_cryptodev_stats stats;
        /**< Queue pair statistics */
        uint8_t digest_idx;
@@ -268,22 +267,10 @@ struct aesni_mb_session {
        } aead;
 } __rte_cache_aligned;
 
-
-
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
-/**
- *
- */
 extern int
 aesni_mb_set_session_parameters(const MB_MGR *mb_mgr,
                struct aesni_mb_session *sess,
                const struct rte_crypto_sym_xform *xform);
-#else
-extern int
-aesni_mb_set_session_parameters(const struct aesni_mb_op_fns *mb_ops,
-               struct aesni_mb_session *sess,
-               const struct rte_crypto_sym_xform *xform);
-#endif
 
 /** device specific operations function pointer structure */
 extern struct rte_cryptodev_ops *rte_aesni_mb_pmd_ops;