app/crypto-perf: avoid wrong operation type for AEAD algos

When somebody use bad --optype with aead algorithms
segmentation fault could happen.

Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")
Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c
index da82ce9cd4f35f1b3f26abed85cc133a0711310e..d6afc8548f375c301f22a86c3298f3cbb56766c3 100644 (file)
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -643,6 +643,17 @@ cperf_options_check(struct cperf_options *options)
                }
        }
 
+       if (options->cipher_algo == RTE_CRYPTO_CIPHER_AES_GCM ||
+                       options->cipher_algo == RTE_CRYPTO_CIPHER_AES_CCM ||
+                       options->auth_algo == RTE_CRYPTO_AUTH_AES_GCM ||
+                       options->auth_algo == RTE_CRYPTO_AUTH_AES_CCM ||
+                       options->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+               if (options->op_type != CPERF_AEAD) {
+                       RTE_LOG(ERR, USER1, "Use --optype aead\n");
+                       return -EINVAL;
+               }
+       }
+
        return 0;
 }
 

diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index c1eaaff9f792e2dfdcb09c8020ec257b4babe9a8..fb3f72e10f26a829fa553a12735e700b347d15ee 100644 (file)
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -118,7 +118,8 @@ cperf_verify_devices_capabilities(struct cperf_options *opts,
 
                if (opts->op_type == CPERF_AUTH_ONLY ||
                                opts->op_type == CPERF_CIPHER_THEN_AUTH ||
-                               opts->op_type == CPERF_AUTH_THEN_CIPHER)  {
+                               opts->op_type == CPERF_AUTH_THEN_CIPHER ||
+                               opts->op_type == CPERF_AEAD)  {
 
                        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
                        cap_idx.algo.auth = opts->auth_algo;
@@ -139,7 +140,8 @@ cperf_verify_devices_capabilities(struct cperf_options *opts,
 
                if (opts->op_type == CPERF_CIPHER_ONLY ||
                                opts->op_type == CPERF_CIPHER_THEN_AUTH ||
-                               opts->op_type == CPERF_AUTH_THEN_CIPHER) {
+                               opts->op_type == CPERF_AUTH_THEN_CIPHER ||
+                               opts->op_type == CPERF_AEAD) {
 
                        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
                        cap_idx.algo.cipher = opts->cipher_algo;

diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index 1117ebf6d3629f5a73962b03bd35e8bed358c0b6..478d256e944722fb9ef1a439cd8c35ab0250138b 100644 (file)
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -181,6 +181,8 @@ The following are the appication command-line options:
            auth-then-cipher
            aead
 
+        For GCM/CCM algorithms you should use aead flag.
+
 * ``--sessionless``
 
         Enable session-less crypto operations mode.