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 C3B2DA0350 for ; Tue, 8 Feb 2022 15:09:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3EC6410FC; Tue, 8 Feb 2022 15:09:53 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130043.outbound.protection.outlook.com [40.107.13.43]) by mails.dpdk.org (Postfix) with ESMTP id 93449410FC for ; Tue, 8 Feb 2022 15:09:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A2mXhycCkKkiCXFVuhITL9jV1kiTxK7P6xIY/dPsQAP/bRfhb40jSFxotrDaLHhSplpzOpasXJV4j6wP/4MydyUYKYiOSFcfmyB9pFqnXtnKpAAdustBDKKtExtTohctk3AqHJXJWig2esHJ0OWKWZIIfBmgiVcKFS+DE0VwEuYJ1h5gKUWvbGpEZO9pOQ2oZbkiXIKuiGlkSaQdkE9P2sHzq1sU52NV7o8E3+Pn5T7x710gRIB6pXOU5zGD22IQPajJcrZHxMzuAn0UWeFlN0apV+INBk1CpIEJOXm1qt61LzEalLZEkDMREHrI+xAbevNr65XX5mKiQV4hN76V6A== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=od8+ze1HcDD9aqPJmECWjvbNrpZkxMpHyJuI/YyggWw=; b=Ocw54Vf2KwO8xj9zNiNBvABdIcap3ivzD8Ca6hX8m5r3lFW/ruwv46szHI/mQDBhxFPzSw+syJDTMI7mETUqPKb5yiBOb0tEnLx0jz3pAVXOikwkUi8XZEvpcYAdvLVKh7MFHJE6baRPSyjdKYBGwBKtV3WxPeX0bADJaFoJsWj+VRmTh41E7EQiwOh8PzXcU3IcH7Fi4baUOddbhXzwyDB1f1Eb87Jt7jdH+WSsSE0cxZuIQTTrLDyCchd26/eCMK7KNuesdjfbAjChTZrBzHCRY8IkDLMeDAbKxbGMD2tK8xgmqsdBACI9otirllzL02i4mF7QhcfkYISRKv3ieQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=od8+ze1HcDD9aqPJmECWjvbNrpZkxMpHyJuI/YyggWw=; b=q/GBz4OTGpat2O3u0i+J7j5I7YEE7Pkv5/pOvXcK+O5vguU4msQ8u/LSbLN3lXLlW8cr5d5wlhmOzQpPJ+3Qn9H36087ZieSmS46bnyXX9LYzDGM2qndHVmZF5KFzN6ksuQfWFw6MFqUlfBHPerJzBj0+BaOEHtCPhpouRMpYEw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by AM9PR04MB8874.eurprd04.prod.outlook.com (2603:10a6:20b:409::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 14:09:47 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::4146:965b:5645:9269]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::4146:965b:5645:9269%4]) with mapi id 15.20.4951.018; Tue, 8 Feb 2022 14:09:47 +0000 From: Gagandeep Singh To: nipun.gupta@nxp.com Cc: Hemant Agrawal , stable@dpdk.org Subject: [PATCH 5/7] crypto/dpaa2: fix to check next type for auth or cipher Date: Tue, 8 Feb 2022 19:38:31 +0530 Message-Id: <20220208140833.1912562-5-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208140833.1912562-1-g.singh@nxp.com> References: <20220208140833.1912562-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR0601CA0024.apcprd06.prod.outlook.com (2603:1096:3::34) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e5190ca-c616-4f06-29e9-08d9eb0caa0a X-MS-TrafficTypeDiagnostic: AM9PR04MB8874:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9NYlSyO/xYddxTLXwddK4yzcm/xLkPyksvCerUuVI6ybpyUl8RQZcvPnjbC45zNqwcAm1K0wx5f5PZHko22SWi5yokUc2vjKqyn+sPtDAitzrOaCm2ltUufX8M11jC/PtpgjRCxfIZ3dPrO1J/DmdGXaZ0AkT2+XMxQbmICGanSw4uHn/lKjV+/rW1wImHv4gzeO6lrBLv8CBbl5zuR7XXW8ilSIXAPLPRZF/3FXWT9b4s9Gd2MWv0ULqnt5VLeXDuon8Ktl4UYdptyGf5MbXX7h98jx/mC9f/vxA9zso7Tzvg5PvTdKscyT6RTsuc0oJ5igt460ArCUSS/rLLiuu8Evu0n3nK2aEbr0p4Ziu24ZeKfOrwNgG5rmaf8d+ffMwiqxmNVnyfZIbtUNB5Uv3o/YeCAxqCdfx6XEnnKTiSikVzcv6vLllI6oNhHeAsjNLxDhRMmcgTlWXBNvTjo9ExQ1jqLcKT5VmmohRsDYGTx202G8xVNXAHKdGgigTX5+kMMt0jxcR3BIoyGyivIiT+/RBs980+HLcBdGAeVqzumG8LMtJJwNqn1TLiCtH+EcxwzHgudTLjeHLRJzJIThcaoWbkF7wjB4NiTCbU+7TziuYxo129qOvGKva8TIjnoAKzd9pEc5LxM4rtOlk8/1l0RfIGKNM6Xwk8JIR7F/zlMfOMPu5tHIPH/P6aIdQJAZ/8z0wN7jfFkJxSdEf9NhaQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(508600001)(6486002)(2616005)(38350700002)(26005)(5660300002)(38100700002)(1076003)(186003)(6512007)(34206002)(37006003)(6636002)(66946007)(66476007)(66556008)(52116002)(55236004)(83380400001)(316002)(36756003)(86362001)(8676002)(6666004)(8936002)(4326008)(2906002)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OrynZVLjsQOumhjohtLACB42ThqdF4aB+BuWe2SNF5Rc4HQX4nSK+AvevO83?= =?us-ascii?Q?wDJopnzh+ol3Ql2kJeh+AZtZeawgIFBEKPOqz9NukmP1uCQSHNFWtfqSW3Fx?= =?us-ascii?Q?5gw6AimfK9h5pZtMtES82ZTu90wLA2p0pvio4czBaeA8bLMc01KH0QE62rOw?= =?us-ascii?Q?uJzydEqRXBq4MdEj+vEOn1JoXpIGnE0MwfRRNkvkVnlXVYi5mV+w6zvV+2fi?= =?us-ascii?Q?Y0NgH1iIO4K4gJA/a8pGz+1D1iuq1vErndgGusaFH/Z2PjuFT3/pTiMKNF6v?= =?us-ascii?Q?tHe8K0qws9mA78deyI+pzHg5XWPWcscDcMcPGNkLdkIEcahbKuQTWvg4h1HU?= =?us-ascii?Q?8zop10bi0Z4Z95CGLwbb+8FBbIktuq2sGBVSU/RYroCDTu6fuy9ppoxYySZJ?= =?us-ascii?Q?CKxDPKyyEqGZIIUoufd7aNbDNYHj9GirPkEp7OG3qiOYCQP1ReK5OtnwLPGc?= =?us-ascii?Q?xbpPtzahPfrC5v1sHiqgadZlLJnxNUbpDOjqEA3VTCu47tO6/wZB4yDZMGNv?= =?us-ascii?Q?ac4L/ZkSRHG1vES0FDBKXokLGkT0CJg8DBdV/AaKUVgT+O/1haY4OYfjCeTi?= =?us-ascii?Q?GNxnpl7L85HPC9OSRAFbDQMVL9R8cnaG1rf+/2o6DcmIxUmdmIDPvQSrEsIe?= =?us-ascii?Q?rJ8hLkkpUdHRJ7lZuVXUvQAmD8DJTZ3OTmhDzLkq6nlJtIa+mjCs6V0LrVPd?= =?us-ascii?Q?CZUlQnJQ2UFLSW3V0/T6ebKrh14FbLTacqhsr69nXzqw3zDaYQgy/IWU0vxy?= =?us-ascii?Q?WWuADeDqRDuyIB+OwXf/wkzlpp1SSqC41h1ozHdE1ZndrODUTxUwyLX2J03j?= =?us-ascii?Q?HEf7tlljMDlR73e/cKo0ty3jHjqtQZWk5cAk5QKqz7MKnmzV0zWJ6/jqMUfi?= =?us-ascii?Q?WutP9eN8kQcBh2TuK03kN5Ecpce3T8o3/k1G+YWlLiLzTDg9omoKjnPGuxpC?= =?us-ascii?Q?QZ2BqDLKtFSjVHeDdLT7MuJC+YrDSnvnO09LBrrUSQiwGb8Vj15+vn1/YU8i?= =?us-ascii?Q?ZwN6MlklNE131Fma50HG3Sabx2jM0/XPzGQhtXuflcpnKdLgMxQvJ82+xzfE?= =?us-ascii?Q?HwJXTE0FZMiIHPzWid3LzGZ7Qt94zk+UatgAbTlfdgoyXNZ1AQ4SMHgKPFyf?= =?us-ascii?Q?g5iDr6UL4bBMPla8he9OaQsRR50MUpXZTEabB2jEmltsu2LbB/go4mThCqvG?= =?us-ascii?Q?mK1DVTudcMCVKIAwqbxSY0xIMW2fbr4uuvzjwVY07R58gYjs3hqz9zeA4rXe?= =?us-ascii?Q?t09xM3iRS26TOZlAccv1Rus68AEE7pcDCBcgacXXflIPMfB3guye6ZyN0PxA?= =?us-ascii?Q?w8dzD1VWsZbv5YAMwGk4ya9dvcrpMq7fbWIFUm6Vu9F11M0Ub8Uxs5JisHyP?= =?us-ascii?Q?Xx7tAzOb69iAcLIBsu4V2ZEf0GhdcaBa0IGTctGrXqnm+z+zp0aoWKdRaNwN?= =?us-ascii?Q?nkTT3GBQN02DIQWlhkUpc5SjQDcbQHHcXIgQum+co5RX09Yn6Wmcb3lcwp0j?= =?us-ascii?Q?+iMjZSED4k16aNn/xypuFXDt6EKKfmV+yKOpjpVOZjw2riMNppJpKVXc6CVi?= =?us-ascii?Q?JIQzFGFYXQiBLEzdyUc=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e5190ca-c616-4f06-29e9-08d9eb0caa0a X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 14:09:47.6125 (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: nc9M1Hdnj4h4dsFbOdDyGLDX78hIBKflq+hi/1BLv03FKr1/dW6kuaEl3/7lDmar X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8874 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: , Errors-To: stable-bounces@dpdk.org From: Hemant Agrawal This patch add more checks on next type for PDCP cases. Fixes: 45e019608f31 ("crypto/dpaa2_sec: support integrity only PDCP") Fixes: a1173d55598c ("crypto/dpaa_sec: support PDCP offload") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 ++++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 444e1f0043..cb8aaf6446 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3231,13 +3231,15 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, /* find xfrm types */ if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { cipher_xform = &xform->cipher; - if (xform->next != NULL) { + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) { 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) { + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { session->ext_params.aead_ctxt.auth_cipher_text = false; cipher_xform = &xform->next->cipher; } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 1dedd9eee5..af166252ca 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2984,11 +2984,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, /* find xfrm types */ if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { cipher_xform = &xform->cipher; - if (xform->next != NULL) + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) auth_xform = &xform->next->auth; } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { auth_xform = &xform->auth; - if (xform->next != NULL) + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) cipher_xform = &xform->next->cipher; } else { DPAA_SEC_ERR("Invalid crypto type"); -- 2.25.1