diff mbox series

[v2] crypto/qat: fix checks for 3gpp algo bit params

Message ID 1531332163-28453-1-git-send-email-fiona.trahe@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers
Series [v2] crypto/qat: fix checks for 3gpp algo bit params |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Fiona Trahe July 11, 2018, 6:02 p.m. UTC 
QAT driver checks byte alignment for KASUMI/SNOW 3G/ZUC algorithms using
cipher/auth_param, which are not initialized at this moment yet. Use
operation params instead.

Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
---
Change in v2 :
- fixed implementation to avoid data truncation

This fix should be backported to stable.
In 18.08 the code location has changed.
In earlier releases it was 
in qat_write_hw_desc_entry() in qat/qat_crypto.c



 drivers/crypto/qat/qat_sym.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Dmitry Eremin-Solenikov July 12, 2018, 8:19 a.m. UTC | #1 
On 11 July 2018 at 21:02, Fiona Trahe <fiona.trahe@intel.com> wrote:
> QAT driver checks byte alignment for KASUMI/SNOW 3G/ZUC algorithms using
> cipher/auth_param, which are not initialized at this moment yet. Use
> operation params instead.
>
> Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>

Thanks, this should fix the issue.
De Lara Guarch, Pablo July 13, 2018, 2:15 p.m. UTC | #2 
> -----Original Message-----
> From: Trahe, Fiona
> Sent: Wednesday, July 11, 2018 7:03 PM
> To: dev@dpdk.org; dmitry.ereminsolenikov@linaro.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Trahe, Fiona
> <fiona.trahe@intel.com>
> Subject: [PATCH v2] crypto/qat: fix checks for 3gpp algo bit params
> 
> QAT driver checks byte alignment for KASUMI/SNOW 3G/ZUC algorithms using
> cipher/auth_param, which are not initialized at this moment yet. Use operation
> params instead.
> 
> Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
> ---

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
De Lara Guarch, Pablo July 13, 2018, 2:31 p.m. UTC | #3 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of De Lara Guarch, Pablo
> Sent: Friday, July 13, 2018 3:15 PM
> To: Trahe, Fiona <fiona.trahe@intel.com>; dev@dpdk.org;
> dmitry.ereminsolenikov@linaro.org
> Subject: Re: [dpdk-dev] [PATCH v2] crypto/qat: fix checks for 3gpp algo bit
> params
> 
> 
> 
> > -----Original Message-----
> > From: Trahe, Fiona
> > Sent: Wednesday, July 11, 2018 7:03 PM
> > To: dev@dpdk.org; dmitry.ereminsolenikov@linaro.org
> > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Trahe,
> > Fiona <fiona.trahe@intel.com>
> > Subject: [PATCH v2] crypto/qat: fix checks for 3gpp algo bit params
> >
> > QAT driver checks byte alignment for KASUMI/SNOW 3G/ZUC algorithms
> > using cipher/auth_param, which are not initialized at this moment yet.
> > Use operation params instead.
> >
> > Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
> > ---
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Added Fixes line and Cc stable.

Applied to dpdk-next-crypto.
Thanks,

Pablo
diff mbox series

Patch

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index aa6eeb0..4ed7d95 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -225,9 +225,8 @@  qat_sym_build_request(void *in_op, uint8_t *out_msg,
 				ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3) {
 
 			if (unlikely(
-				(cipher_param->cipher_length % BYTE_LENGTH != 0)
-				 || (cipher_param->cipher_offset
-							% BYTE_LENGTH != 0))) {
+			    (op->sym->cipher.data.length % BYTE_LENGTH != 0) ||
+			    (op->sym->cipher.data.offset % BYTE_LENGTH != 0))) {
 				QAT_DP_LOG(ERR,
 		  "SNOW3G/KASUMI/ZUC in QAT PMD only supports byte aligned values");
 				op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
@@ -260,8 +259,9 @@  qat_sym_build_request(void *in_op, uint8_t *out_msg,
 			ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_KASUMI_F9 ||
 			ctx->qat_hash_alg ==
 				ICP_QAT_HW_AUTH_ALGO_ZUC_3G_128_EIA3) {
-			if (unlikely((auth_param->auth_off % BYTE_LENGTH != 0)
-				|| (auth_param->auth_len % BYTE_LENGTH != 0))) {
+			if (unlikely(
+			    (op->sym->auth.data.offset % BYTE_LENGTH != 0) ||
+			    (op->sym->auth.data.length % BYTE_LENGTH != 0))) {
 				QAT_DP_LOG(ERR,
 		"For SNOW3G/KASUMI/ZUC, QAT PMD only supports byte aligned values");
 				op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;