qat: fix checks for 3gpp algorithms vs bit mode

Message ID 20180711122432.14658-1-dmitry.ereminsolenikov@linaro.org
State New
Headers show
Series
  • qat: fix checks for 3gpp algorithms vs bit mode
Related show

Commit Message

Dmitry Eremin-Solenikov July 11, 2018, 12:24 p.m.
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: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

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

-- 
2.18.0

Comments

Trahe, Fiona July 11, 2018, 6:04 p.m. | #1
Hi Dmitri,

Thanks for debugging this. 
However the below fix can truncate the data - I'll send an alternative fix shortly.
Fiona

> -----Original Message-----

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Dmitry Eremin-Solenikov

> Sent: Wednesday, July 11, 2018 1:25 PM

> To: dev@dpdk.org

> Subject: [dpdk-dev] [PATCH] qat: fix checks for 3gpp algorithms vs bit mode

> 

> 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: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

> ---

>  drivers/crypto/qat/qat_sym.c | 22 +++++++++++-----------

>  1 file changed, 11 insertions(+), 11 deletions(-)

> 

> diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c

> index 17d63eb1ee35..0ede2c23d54f 100644

> --- a/drivers/crypto/qat/qat_sym.c

> +++ b/drivers/crypto/qat/qat_sym.c

> @@ -224,18 +224,16 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,

>  			ctx->qat_cipher_alg ==

>  				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))) {

> +			cipher_len = op->sym->cipher.data.length >> 3;

> +			cipher_ofs = op->sym->cipher.data.offset >> 3;

> +

> +			if (unlikely((cipher_len % BYTE_LENGTH != 0)

> +				|| (cipher_ofs % 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;

>  				return -EINVAL;

>  			}

> -			cipher_len = op->sym->cipher.data.length >> 3;

> -			cipher_ofs = op->sym->cipher.data.offset >> 3;

> -

>  		} else if (ctx->bpi_ctx) {

>  			/* DOCSIS - only send complete blocks to device

>  			 * Process any partial block using CFB mode.

> @@ -260,15 +258,17 @@ 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))) {

> +

> +			auth_ofs = op->sym->auth.data.offset >> 3;

> +			auth_len = op->sym->auth.data.length >> 3;

> +

> +			if (unlikely((auth_off % BYTE_LENGTH != 0)

> +				|| (auth_len % 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;

>  				return -EINVAL;

>  			}

> -			auth_ofs = op->sym->auth.data.offset >> 3;

> -			auth_len = op->sym->auth.data.length >> 3;

> 

>  			auth_param->u1.aad_adr =

>  					rte_crypto_op_ctophys_offset(op,

> --

> 2.18.0
Dmitry Eremin-Solenikov July 12, 2018, 8:19 a.m. | #2
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.

-- 
With best wishes
Dmitry
De Lara Guarch, Pablo July 13, 2018, 1:02 p.m. | #3
Hi Fiona,

> -----Original Message-----

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Trahe, Fiona

> Sent: Wednesday, July 11, 2018 7:04 PM

> To: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>;

> dev@dpdk.org

> Cc: Trahe, Fiona <fiona.trahe@intel.com>

> Subject: Re: [dpdk-dev] [PATCH] qat: fix checks for 3gpp algorithms vs bit mode

> 

> Hi Dmitri,

> 

> Thanks for debugging this.

> However the below fix can truncate the data - I'll send an alternative fix shortly.

> Fiona

> 

> > -----Original Message-----

> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Dmitry

> > Eremin-Solenikov

> > Sent: Wednesday, July 11, 2018 1:25 PM

> > To: dev@dpdk.org

> > Subject: [dpdk-dev] [PATCH] qat: fix checks for 3gpp algorithms vs bit

> > mode

> >

> > 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: Dmitry Eremin-Solenikov

> > <dmitry.ereminsolenikov@linaro.org>


I'll add a Reported-by line for Dmitry, for flagging the issue.
De Lara Guarch, Pablo July 13, 2018, 2:15 p.m. | #4
> -----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. | #5
> -----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

Patch

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 17d63eb1ee35..0ede2c23d54f 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -224,18 +224,16 @@  qat_sym_build_request(void *in_op, uint8_t *out_msg,
 			ctx->qat_cipher_alg ==
 				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))) {
+			cipher_len = op->sym->cipher.data.length >> 3;
+			cipher_ofs = op->sym->cipher.data.offset >> 3;
+
+			if (unlikely((cipher_len % BYTE_LENGTH != 0)
+				|| (cipher_ofs % 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;
 				return -EINVAL;
 			}
-			cipher_len = op->sym->cipher.data.length >> 3;
-			cipher_ofs = op->sym->cipher.data.offset >> 3;
-
 		} else if (ctx->bpi_ctx) {
 			/* DOCSIS - only send complete blocks to device
 			 * Process any partial block using CFB mode.
@@ -260,15 +258,17 @@  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))) {
+
+			auth_ofs = op->sym->auth.data.offset >> 3;
+			auth_len = op->sym->auth.data.length >> 3;
+
+			if (unlikely((auth_off % BYTE_LENGTH != 0)
+				|| (auth_len % 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;
 				return -EINVAL;
 			}
-			auth_ofs = op->sym->auth.data.offset >> 3;
-			auth_len = op->sym->auth.data.length >> 3;
 
 			auth_param->u1.aad_adr =
 					rte_crypto_op_ctophys_offset(op,