DPDK patches and discussions
 help / color / mirror / Atom feed
From: Akhil Goyal <gakhil@marvell.com>
To: Hemant Agrawal <hemant.agrawal@nxp.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-dev] [EXT] [PATCH v2 01/11] crypto/dpaa2_sec: fix to check next null for auth only case
Date: Thu, 2 Sep 2021 12:46:14 +0000	[thread overview]
Message-ID: <CO6PR18MB44845CBAB19FB65BE8750DD0D8CE9@CO6PR18MB4484.namprd18.prod.outlook.com> (raw)
In-Reply-To: <20210825081837.23830-1-hemant.agrawal@nxp.com>

> This patch fixes the issue to check for next pointer as
> null in the integrity only case in pdcp-security context.
> 
> Fixes: bef594ec5cc8 ("crypto/dpaa2_sec: support PDCP offload")
> Cc: stable@dpdk.org

This patch is not a fix and need not be backported, because integrity
only case is not a valid case for PDCP before the introduction of short MAC.
Since short MAC is supported here in this release only, this should be reworded
as to support short MAC, integrity-only case is required to be supported for
PDCP.
And this patch should be part of the short MAC-I series and not this one.

> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---
>  drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 25 +++++++++++----------
>  1 file changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> index fe90d9d2d8..87a94b2c04 100644
> --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> @@ -3095,7 +3095,7 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev
> *dev,
>  	struct rte_security_pdcp_xform *pdcp_xform = &conf->pdcp;
>  	struct rte_crypto_sym_xform *xform = conf->crypto_xform;
>  	struct rte_crypto_auth_xform *auth_xform = NULL;
> -	struct rte_crypto_cipher_xform *cipher_xform;
> +	struct rte_crypto_cipher_xform *cipher_xform = NULL;
>  	dpaa2_sec_session *session = (dpaa2_sec_session *)sess;
>  	struct ctxt_priv *priv;
>  	struct dpaa2_sec_dev_private *dev_priv = dev->data->dev_private;
> @@ -3127,18 +3127,18 @@ dpaa2_sec_set_pdcp_session(struct
> rte_cryptodev *dev,
>  	flc = &priv->flc_desc[0].flc;
> 
>  	/* find xfrm types */
> -	if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && xform-
> >next == NULL) {
> -		cipher_xform = &xform->cipher;
> -	} else if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
> -		   xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
> -		session->ext_params.aead_ctxt.auth_cipher_text = true;
> +	if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
>  		cipher_xform = &xform->cipher;
> -		auth_xform = &xform->next->auth;
> -	} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
> -		   xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
> -		session->ext_params.aead_ctxt.auth_cipher_text = false;
> -		cipher_xform = &xform->next->cipher;
> +		if (xform->next != NULL) {
> +			session->ext_params.aead_ctxt.auth_cipher_text =
> true;
> +			auth_xform = &xform->next->auth;
> +		}
> +	} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
>  		auth_xform = &xform->auth;
> +		if (xform->next != NULL) {
> +			session->ext_params.aead_ctxt.auth_cipher_text =
> false;
> +			cipher_xform = &xform->next->cipher;
> +		}
>  	} else {
>  		DPAA2_SEC_ERR("Invalid crypto type");
>  		return -EINVAL;
> @@ -3177,7 +3177,8 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev
> *dev,
>  	session->pdcp.hfn_threshold = pdcp_xform->hfn_threshold;
>  	session->pdcp.hfn_ovd = pdcp_xform->hfn_ovrd;
>  	/* hfv ovd offset location is stored in iv.offset value*/
> -	session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset;
> +	if (cipher_xform)
> +		session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset;
> 
>  	cipherdata.key = (size_t)session->cipher_key.data;
>  	cipherdata.keylen = session->cipher_key.length;
> --
> 2.17.1


  parent reply	other threads:[~2021-09-02 12:46 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-21  7:39 [dpdk-dev] [PATCH 1/5] " Hemant Agrawal
2021-07-21  7:39 ` [dpdk-dev] [PATCH 2/5] crypto/dpaa_sec: support DES-CBC Hemant Agrawal
2021-07-21  7:39 ` [dpdk-dev] [PATCH 3/5] crypto/dpaa_sec: support non-HMAC auth algos Hemant Agrawal
2021-07-21  7:39 ` [dpdk-dev] [PATCH 4/5] crypto/dpaa_sec: support AES-XCBC-MAC Hemant Agrawal
2021-07-21  7:39 ` [dpdk-dev] [PATCH 5/5] crypto/dpaa_sec: add support for AES CMAC integrity check Hemant Agrawal
2021-08-25  8:18 ` [dpdk-dev] [PATCH v2 01/11] crypto/dpaa2_sec: fix to check next null for auth only case Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 02/11] crypto/dpaa_sec: support DES-CBC Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 03/11] crypto/dpaa_sec: support non-HMAC auth algos Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 04/11] crypto/dpaa_sec: support AES-XCBC-MAC Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 05/11] crypto/dpaa_sec: add support for AES CMAC integrity check Hemant Agrawal
2021-09-02 13:46     ` [dpdk-dev] [EXT] " Akhil Goyal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 06/11] common/dpaax: caamflib load correct HFN from DESCBUF Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 07/11] common/dpaax: caamflib do not clear DPOVRD Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 08/11] common/dpaax: enhance caamflib with inline keys Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 09/11] common/dpaax: fix IV value for shortMAC-I for SNOW algo Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 10/11] crypto/dpaa_sec: force inline of the keys to save space Hemant Agrawal
2021-08-25  8:18   ` [dpdk-dev] [PATCH v2 11/11] crypto/dpaa2_sec: add error packet counters Hemant Agrawal
2021-09-02 12:46   ` Akhil Goyal [this message]
2021-09-02 13:48     ` [dpdk-dev] [EXT] [PATCH v2 01/11] crypto/dpaa2_sec: fix to check next null for auth only case Hemant Agrawal
2021-09-07  8:39   ` [dpdk-dev] [PATCH v3 01/10] crypto/dpaa_sec: support DES-CBC Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 02/10] crypto/dpaa_sec: support non-HMAC auth algos Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 03/10] crypto/dpaa_sec: support AES-XCBC-MAC Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 04/10] crypto/dpaa_sec: add support for AES CMAC integrity check Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 05/10] common/dpaax: caamflib load correct HFN from DESCBUF Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 06/10] common/dpaax: caamflib do not clear DPOVRD Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 07/10] common/dpaax: enhance caamflib with inline keys Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 08/10] common/dpaax: fix IV value for shortMAC-I for SNOW algo Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 09/10] crypto/dpaa_sec: force inline of the keys to save space Hemant Agrawal
2021-09-07  8:39     ` [dpdk-dev] [PATCH v3 10/10] crypto/dpaa2_sec: add error packet counters Hemant Agrawal
2021-09-07 11:47     ` [dpdk-dev] [EXT] [PATCH v3 01/10] crypto/dpaa_sec: support DES-CBC Akhil Goyal
2021-09-08  6:59     ` [dpdk-dev] [PATCH v4 " Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 02/10] crypto/dpaa_sec: support non-HMAC auth algos Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 03/10] crypto/dpaa_sec: support AES-XCBC-MAC Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 04/10] crypto/dpaa_sec: add support for AES CMAC integrity check Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 05/10] common/dpaax: caamflib load correct HFN from DESCBUF Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 06/10] common/dpaax: caamflib do not clear DPOVRD Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 07/10] common/dpaax: enhance caamflib with inline keys Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 08/10] common/dpaax: fix IV value for shortMAC-I for SNOW algo Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 09/10] crypto/dpaa_sec: force inline of the keys to save space Hemant Agrawal
2021-09-08  6:59       ` [dpdk-dev] [PATCH v4 10/10] crypto/dpaa2_sec: add error packet counters Hemant Agrawal
2021-09-08 10:13       ` [dpdk-dev] [EXT] [PATCH v4 01/10] crypto/dpaa_sec: support DES-CBC Akhil Goyal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CO6PR18MB44845CBAB19FB65BE8750DD0D8CE9@CO6PR18MB4484.namprd18.prod.outlook.com \
    --to=gakhil@marvell.com \
    --cc=dev@dpdk.org \
    --cc=hemant.agrawal@nxp.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).