pmdinfogen: add SPDX license tag

[dpdk.git] / drivers / common / cpt / cpt_ucode.h

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 24b53a1..c310ea7 100644 (file)
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -230,6 +230,9 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key,
                 * sometimes iverride IV per operation.
                 */
                fctx->enc.iv_source = CPT_FROM_DPTR;
+
+               if (cpt_ctx->auth_key_len > 64)
+                       return -1;
        }
 
        switch (type) {
@@ -295,7 +298,7 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key,
                cpt_fc_ciph_set_key_kasumi_f8_cbc(cpt_ctx, key, key_len);
                goto success;
        default:
-               break;
+               return -1;
        }
 
        /* Only for FC_GEN case */
@@ -370,7 +373,7 @@ fill_sg_comp_from_iov(sg_comp_t *list,
 {
        int32_t j;
        uint32_t extra_len = extra_buf ? extra_buf->size : 0;
-       uint32_t size = *psize - extra_len;
+       uint32_t size = *psize;
        buf_ptr_t *bufs;
 
        bufs = from->bufs;
@@ -379,9 +382,6 @@ fill_sg_comp_from_iov(sg_comp_t *list,
                uint32_t e_len;
                sg_comp_t *to = &list[i >> 2];
 
-               if (!bufs[j].size)
-                       continue;
-
                if (unlikely(from_offset)) {
                        if (from_offset >= bufs[j].size) {
                                from_offset -= bufs[j].size;
@@ -413,18 +413,19 @@ fill_sg_comp_from_iov(sg_comp_t *list,
                                to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len);
                        }
 
+                       extra_len = RTE_MIN(extra_len, size);
                        /* Insert extra data ptr */
                        if (extra_len) {
                                i++;
                                to = &list[i >> 2];
                                to->u.s.len[i % 4] =
-                                       rte_cpu_to_be_16(extra_buf->size);
+                                       rte_cpu_to_be_16(extra_len);
                                to->ptr[i % 4] =
                                        rte_cpu_to_be_64(extra_buf->dma_addr);
-
-                               /* size already decremented by extra len */
+                               size -= extra_len;
                        }
 
+                       next_len = RTE_MIN(next_len, size);
                        /* insert the rest of the data */
                        if (next_len) {
                                i++;
@@ -2537,6 +2538,9 @@ cpt_fc_auth_set_key(void *ctx, auth_type_t type, const uint8_t *key,
                        cpt_ctx->fc_type = HASH_HMAC;
        }
 
+       if (cpt_ctx->fc_type == FC_GEN && key_len > 64)
+               return -1;
+
        /* For GMAC auth, cipher must be NULL */
        if (type == GMAC_TYPE)
                fctx->enc.enc_cipher = 0;
@@ -2551,7 +2555,9 @@ cpt_fc_auth_set_key(void *ctx, auth_type_t type, const uint8_t *key,
                cpt_ctx->auth_key_len = key_len;
                memset(fctx->hmac.ipad, 0, sizeof(fctx->hmac.ipad));
                memset(fctx->hmac.opad, 0, sizeof(fctx->hmac.opad));
-               memcpy(fctx->hmac.opad, key, key_len);
+
+               if (key_len <= 64)
+                       memcpy(fctx->hmac.opad, key, key_len);
                fctx->enc.auth_input_type = 1;
        }
        return 0;
@@ -2608,10 +2614,13 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,
        sess->iv_length = aead_form->iv.length;
        sess->aad_length = aead_form->aad_length;
 
-       cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
-                       aead_form->key.length, NULL);
+       if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
+                       aead_form->key.length, NULL)))
+               return -1;
 
-       cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, aead_form->digest_length);
+       if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+                       aead_form->digest_length)))
+               return -1;
 
        return 0;
 }
@@ -2711,8 +2720,9 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,
        sess->iv_length = c_form->iv.length;
        sess->is_null = is_null;
 
-       cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, c_form->key.data,
-                           c_form->key.length, NULL);
+       if (unlikely(cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type,
+                       c_form->key.data, c_form->key.length, NULL)))
+               return -1;
 
        return 0;
 }
@@ -2736,11 +2746,6 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
                return -1;
        }
 
-       if (a_form->key.length > 64) {
-               CPT_LOG_DP_ERR("Auth key length is big");
-               return -1;
-       }
-
        switch (a_form->algo) {
        case RTE_CRYPTO_AUTH_SHA1_HMAC:
                /* Fall through */
@@ -2811,8 +2816,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
                sess->auth_iv_offset = a_form->iv.offset;
                sess->auth_iv_length = a_form->iv.length;
        }
-       cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, a_form->key.data,
-                           a_form->key.length, a_form->digest_length);
+       if (unlikely(cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type,
+                       a_form->key.data, a_form->key.length,
+                       a_form->digest_length)))
+               return -1;
 
        return 0;
 }
@@ -2855,9 +2862,13 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,
        sess->iv_length = a_form->iv.length;
        sess->mac_len = a_form->digest_length;
 
-       cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
-                       a_form->key.length, NULL);
-       cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, a_form->digest_length);
+       if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
+                       a_form->key.length, NULL)))
+               return -1;
+
+       if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+                       a_form->digest_length)))
+               return -1;
 
        return 0;
 }