net/ice/base: avoid undefined behavior

[dpdk.git] / drivers / crypto / qat / qat_sym.c

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 46ef27a..25b6dd5 100644 (file)
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2018 Intel Corporation
+ * Copyright(c) 2015-2019 Intel Corporation
  */
 
 #include <openssl/evp.h>
@@ -12,6 +12,7 @@
 
 #include "qat_sym.h"
 
+
 /** Decrypt a single partial block
  *  Depends on openssl libcrypto
  *  Uses ECB+XOR to do CFB encryption, same result, more performant
@@ -61,7 +62,8 @@ qat_bpicipher_preprocess(struct qat_sym_session *ctx,
                last_block = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_src,
                                uint8_t *, last_block_offset);
 
-               if (unlikely(sym_op->m_dst != NULL))
+               if (unlikely((sym_op->m_dst != NULL)
+                               && (sym_op->m_dst != sym_op->m_src)))
                        /* out-of-place operation (OOP) */
                        dst = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_dst,
                                                uint8_t *, last_block_offset);
@@ -195,7 +197,8 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
        rte_mov128((uint8_t *)qat_req, (const uint8_t *)&(ctx->fw_req));
        qat_req->comn_mid.opaque_data = (uint64_t)(uintptr_t)op;
        cipher_param = (void *)&qat_req->serv_specif_rqpars;
-       auth_param = (void *)((uint8_t *)cipher_param + sizeof(*cipher_param));
+       auth_param = (void *)((uint8_t *)cipher_param +
+                       ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET);
 
        if (ctx->qat_cmd == ICP_QAT_FW_LA_CMD_HASH_CIPHER ||
                        ctx->qat_cmd == ICP_QAT_FW_LA_CMD_CIPHER_HASH) {
@@ -307,9 +310,8 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
                }
                min_ofs = auth_ofs;
 
-               if (likely(ctx->qat_hash_alg != ICP_QAT_HW_AUTH_ALGO_NULL))
-                       auth_param->auth_res_addr =
-                                       op->sym->auth.digest.phys_addr;
+               auth_param->auth_res_addr =
+                       op->sym->auth.digest.phys_addr;
 
        }
 
@@ -426,7 +428,8 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
                min_ofs = op->sym->aead.data.offset;
        }
 
-       if (op->sym->m_src->next || (op->sym->m_dst && op->sym->m_dst->next))
+       if (op->sym->m_src->nb_segs > 1 ||
+                       (op->sym->m_dst && op->sym->m_dst->nb_segs > 1))
                do_sgl = 1;
 
        /* adjust for chain case */
@@ -436,7 +439,8 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
        if (unlikely(min_ofs >= rte_pktmbuf_data_len(op->sym->m_src) && do_sgl))
                min_ofs = 0;
 
-       if (unlikely(op->sym->m_dst != NULL)) {
+       if (unlikely((op->sym->m_dst != NULL) &&
+                       (op->sym->m_dst != op->sym->m_src))) {
                /* Out-of-place operation (OOP)
                 * Don't align DMA start. DMA the minimum data-set
                 * so as not to overwrite data in dest buffer
@@ -564,7 +568,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
                        return ret;
                }
 
-               if (likely(op->sym->m_dst == NULL))
+               if (in_place)
                        qat_req->comn_mid.dest_data_addr =
                                qat_req->comn_mid.src_data_addr =
                                cookie->qat_sgl_src_phys_addr;
@@ -593,6 +597,13 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
                qat_req->comn_mid.dest_data_addr = dst_buf_start;
        }
 
+       /* Handle Single-Pass GCM */
+       if (ctx->is_single_pass) {
+               cipher_param->spc_aad_addr = op->sym->aead.aad.phys_addr;
+               cipher_param->spc_auth_res_addr =
+                               op->sym->aead.digest.phys_addr;
+       }
+
 #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
        QAT_DP_HEXDUMP_LOG(DEBUG, "qat_req:", qat_req,
                        sizeof(struct icp_qat_fw_la_bulk_req));