From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A6446A0C4D for ; Thu, 2 Sep 2021 15:49:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 943F440686; Thu, 2 Sep 2021 15:49:38 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60064.outbound.protection.outlook.com [40.107.6.64]) by mails.dpdk.org (Postfix) with ESMTP id D6A7F4003E; Thu, 2 Sep 2021 15:49:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gt3f3YfbhqyjXwR4DfDk890LuG0Wzz5gXgKh7akf3Feal+ZlMJB4Q/RCAx4S++Rj7OYLOksucTkBgSw1klfq97pXf9Co2onNNyo4yHXU78hKV3YT9OUfRKxjcJ/2Op8BWL3VPrO1vG7U/NWfj+DD7dHkEEk7J7pMLsB8Mai8RXXoBsfz8pbIgIyGr9jPYUUb/qon0Z8OFvEqSD0k3VsrbwzmdzSPREks4Dp8v0IIM1MeoPTPNOYWj5l0tyeJqrKjX4QM3bvaMwn+Ne+ocsymtRmqD88UDQ0rOOP4mLdrwNNSdkRoX41yDhdgSTouAtHokf1564xhcRzFD37lvGUTcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=z0zjaXVT/bG8MfZQVGy2TpgHaJkJxi0wjZ9ZrhbXAow=; b=LS+Hdp8mEBtZneBKoiXbn54KiwAWkgF2uZ/K1Di1frTjBK35tSht49V3oRhA1Hh1FZta/sK7CaieLYC9GLjAR+IxbK4C+fdaUQPF0rwh9vrh86AarpwwHo3IbJltBcBLdFUDyT1trVlamtkYrHVOSm5eATA7IC81as1mcjOSQKhloWV9X4tJynYFytYrbqdDfOXSLOqRchA29eLJDlHTJ3RD3zDu8SRBw9BpVdMpGfYC/Mn/WmU0Ug+mwA0+9IR1ooT7oc/E1siWRSHJIQ2HrSlPDQ/EqJOm6i9h324WyrvmpauNfFi396yQRfYj3u+XyH0y6WmZTHGhmZjZJsO0/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z0zjaXVT/bG8MfZQVGy2TpgHaJkJxi0wjZ9ZrhbXAow=; b=Gx/IT5lGGZGH8yBbivr4mlnIUa9UPaxGJ8vicuVVJkZl6W56puzE4CNsfM7hny4MKFIUA0NFACTdFic2gcYB8HgjV5KR20OfWNouOGkyr18CwKZvXy1ruiwrDFxaTzgdSLcXwlt2LAym41i6bJoKshwbR1vONIPlWPF+AuUptRM= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=oss.nxp.com; Received: from DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) by DU2PR04MB9020.eurprd04.prod.outlook.com (2603:10a6:10:2e3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Thu, 2 Sep 2021 13:49:34 +0000 Received: from DU2PR04MB8630.eurprd04.prod.outlook.com ([fe80::945d:e362:712d:1b80]) by DU2PR04MB8630.eurprd04.prod.outlook.com ([fe80::945d:e362:712d:1b80%4]) with mapi id 15.20.4478.021; Thu, 2 Sep 2021 13:49:34 +0000 To: Akhil Goyal , Hemant Agrawal , "dev@dpdk.org" Cc: "stable@dpdk.org" References: <20210721073920.21893-1-hemant.agrawal@nxp.com> <20210825081837.23830-1-hemant.agrawal@nxp.com> From: Hemant Agrawal Message-ID: Date: Thu, 2 Sep 2021 19:18:29 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-ClientProxiedBy: SGXP274CA0013.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::25) To DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.3] (122.161.79.32) by SGXP274CA0013.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Thu, 2 Sep 2021 13:49:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e6b9d6a-9911-48dd-5fd3-08d96e187eff X-MS-TrafficTypeDiagnostic: DU2PR04MB9020: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /al3D+vjyp8SrpZTA2iBzdM90V8ZbU/ACeYgRsDCe/L764XCW4Cmk/I+Rzi8B/1s4eAcnrD2tNEyNyVdAj/uPGljysXd4YJ5eS2kdj6yL0n6x6fNHMiTcJaELIlV9mFEWKpyYSolDQQoJRvmbRrh2yDYOeklHT1jlp657d0/PCte2btreyPkGelzhaMr/P54TRM4/jhWhxghN2FeSS/w1gqwr4bn7vaj4jhwF7dhrrNZZo6BNlYkeS69VIMBOwK2h2QsLaq2qXuSv1A7lZWlLEiHisXNuG3DbDz1fiZJY4rfmrgIVAK9w3nAC10i/oKGlndCG/Rsn06mDRgIHfc+hQYgA5KteRYo2BJ5qlQlRf4kMLbohpafPGp3Lcn5fZT0rbWkZ/gJJuLmYqvoIqZfa2mEDHaPXoSsk0k4C6a+162FEaFwszzxWL1LiXtPbywB9A+0aHFQoayxI7IK4vs9Ga8++yTBVaMKDSYopIPO9gK6cqDGm3ro4THUUiA49fv8aEFezvS/uoQu+r/+1GzPCZPsgBWG6CaZUV7qSoTgSD1wkhsKtE6u+w4wZNlO7eFzfFVKiWJ5uTVxek2hrnH4MHu2rEYamTEdoS8f+l6wG4WxNRvhoVLnai62Mzrn9n2Ik4xNqLIxDlO6D1xTHDGtyFo1aQGBcboWTbMktbRf+riqnGjUnf8Te0lLt4AHXFM64uZqUCi1+gx2lEgjCVTBTgFtec8Y74Xk7C4fK/DrmIN4FIwX2MN6h7rgk475N4WW4n2dmSMBtz7eyuFbCJs1YA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8630.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(376002)(136003)(39860400002)(346002)(478600001)(6666004)(52116002)(2616005)(956004)(2906002)(38350700002)(38100700002)(31686004)(31696002)(16576012)(4326008)(316002)(8676002)(6486002)(86362001)(110136005)(8936002)(44832011)(66946007)(5660300002)(66556008)(66476007)(186003)(83380400001)(26005)(53546011)(55236004)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eC9RN3FRRngxV0pkbW4zelB4VEszZDlLa0hPWFYrdWpzRkNGenN1VEhUSzZm?= =?utf-8?B?TEFvYXc3ckZEY08wb2o1Q1FJL2VlVVo0SEFGSGV0dFFlQnplcjcvS1dMdFNJ?= =?utf-8?B?T0UyS3VZblNJNEtNZDdtWG84cDBHM3NpZHNrODVwMkk3N0dZNGlYRXNZbktN?= =?utf-8?B?WmVNVEZNYXk4SVZvY1pkQVZEMUF6WjFjQUxOY3c1ZGUzc0RqS3M2WW0yWC9L?= =?utf-8?B?WVZZdWpjVzIvT1Vhb3FzdnorejdHczdLZ25hVzJ2Q3prNE11WUk0SmZaV2VZ?= =?utf-8?B?TEpJUlE3R3lIMEM3N3dyY3VjVU5wNEhpUVoxTjZ2aGhSa2hwOUFPck5kZkVJ?= =?utf-8?B?T3RwVkhjZnhtY0YwcThqT0lTYUdMazBwVWVORUtkK0hoWU1PT1h4NVY4bllx?= =?utf-8?B?bmJOaW9NNUpVVmhCbC9EV2l5eURNOEU5SUJnWnJ4bGtKTjNXZWZMZ2xTS0No?= =?utf-8?B?cCt6T0FYY08rbkF3WEFyRW4yYmFGODVCYWFVQjZhOHRUbVVhNHRsQklXUFFl?= =?utf-8?B?NkFWV0tBZk9iNW9KaldoQ1pmZ2tjMXBJSElFSENCYThSSGhVa1BqeDhrZkYy?= =?utf-8?B?bnBzVWJ1WmpPTitZWklKY1UzWTl3RGQzeWpEMklxajdwYVBhUnhmNFF5Tm5x?= =?utf-8?B?QkF2NFBmZ3RHK0ZtM2pQNGszYTROUFpoSjBOVHJ2Ni9PdCtTVHdrS1crZFNv?= =?utf-8?B?bk9xTEpTK0tYY1d6bTZITGxUaFlYWE14c2xUSURIVEFmcXVnZVhwRzM3NjVz?= =?utf-8?B?bU5sWkhFVXNxYTViQnAxVGcxZVdkaStwa3RMWmZYT2YwanJZSkF1SHZjaUxx?= =?utf-8?B?OUJoRkZ6bUVsN0hiYk5YRkFUOEM2VWpUdXhmamxHTW1JVHYvMHpxb0NiQ3BH?= =?utf-8?B?WFpGSmlrZkJHeWVqbHhKdzU2Y2pSNHd3ZUJiamxQdVhsY2hDWGpaNG1MYm43?= =?utf-8?B?SlluaTQ5MHJUVUloQzhqTGRmVDI2d2JZeTdzeVN6QmdFb1VsRGZYbGR0RWl5?= =?utf-8?B?TFYrMVdmc0lJaTBZeWdUbUJyNlBmMHJGbTA5MVZMbEdJSGM2K3FqT1BXbzE5?= =?utf-8?B?OU1wMTk3R0FrL3ZScVdDYklsTW9Dd1lqSytGOWUzUnBuVzhBR3pmVkh5ZnIr?= =?utf-8?B?TytRMktQeHQvajJGcEtUMHVhai93NDk3d0xGME1hVCtZMkJGNXVQbWM1TG5u?= =?utf-8?B?R3VKWTVqL2RaQUNoUjB1ZjNSa1gzSzQ5Y1BTRU04S3BubzIzVGFiQ3p2Y1pk?= =?utf-8?B?TW5QWTh0Mzg3NEdtODAyNXZVcllFNnpZNE85MEJzOW56ZldRdmFQOExYSmVu?= =?utf-8?B?TmZGYlNBbUcxZ1Y4dW5UWGN5VG0reE44WWxCOEI1VHFLbmcyZ3VaMUxSby9j?= =?utf-8?B?ZHlFVkZQVVZVWGR0ZUlzMGs0TFRYMzEyNnV6VUZoV1hSMDlCRWEvam5NbTBC?= =?utf-8?B?cG9zWmVQSVc0Z2lzUGFEVWZ2Z2Z0YnlRME1kVXB3MkhkOHhNa3dxWlZDejFJ?= =?utf-8?B?cFFhbTRPcU5LaFpPdkg2ckVXWWY1QVdZYWs3UVFTM2NqRDVHT09hVnNvcWVN?= =?utf-8?B?MGxST3Q4SVpxMkJYSHJ2SXpPZEJzdklBTk9OaXhNNThXT0FUajhVL0JKR2pM?= =?utf-8?B?a1JDMGcwMnova1p0ODFMVmdPMnBZdXQrV3BTQlBFZWlpZUdiZTAxa3l5M0Y4?= =?utf-8?B?Qm5FcEN0Q2FoRlBTL2taZVZyNC9lWHk1NjBRejFYUEFiNnRVRFpKSXBrYTNK?= =?utf-8?Q?hwo3HNLSY6K7vbq5duCcxFdfcdQkFkS+U42IWXr?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e6b9d6a-9911-48dd-5fd3-08d96e187eff X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8630.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2021 13:49:34.2932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6BwafNjEtR+K86VG1h3ojctJu2EprbxkbG8+u3Huj7JlCnSA3mFxbnlwxaSbx2UIdPTHOjD48S8uNbYVb4HZ0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9020 Subject: Re: [dpdk-stable] [dpdk-dev] [EXT] [PATCH v2 01/11] crypto/dpaa2_sec: fix to check next null for auth only case X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: hemant.agrawal@nxp.com Errors-To: stable-bounces@dpdk.org Sender: "stable" On 9/2/2021 6:16 PM, Akhil Goyal wrote: >> 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. Ok, >> Signed-off-by: Hemant Agrawal >> --- >> 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