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 F332643E57 for ; Sat, 13 Apr 2024 14:57:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB269402ED; Sat, 13 Apr 2024 14:57:28 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2076.outbound.protection.outlook.com [40.107.223.76]) by mails.dpdk.org (Postfix) with ESMTP id 2964E400D6 for ; Sat, 13 Apr 2024 14:57:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U16F+fxDI/gJUv+ExXBROLN2NeGphoguBhpYx3bBIa0BTC+1SiE6q+GO/GEBEG6gkjlw3Shs9DOJUnxpKjRtiLBszOe5y39kOEAkY12xRgqJ+m9WCHa9+qcx8BFGXJHC9hksVeNf7se+xz7FK0ZCiEM05WtO+E4MqeGXe5F4wuXWvVds6hYzUDkBB3gdLQvwyq1KmvVHcgKOI8NrZu6cZEYhXk7/o5EEh3JI/3MEixVx9JQ6NNYSLpcYh8E1D1Bk9qYPoyl9E3uzKMya9RxG5DAJioUN3lV6RmlpHTbARXLRPHFgpcsYIZmHH9J8XvPFlzem8aWyYCBA9NDhufonbw== 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=UDNsbWREJRglxVN+GZUDGkpZy1FD/DD1GlQNx54gjyo=; b=dhPvsnbGXXIir6HbaKG/ghDmABx2+TbU78LfT65/ChtRJ1Uhjfki3F7Y/mVGP+EIY8brlwvun+ZQLJF+5VMny8mMox0CU9NCuWzYrshGp7joc+ew9Pm4JIU12SeaEcQ9N9+brS7t0p7GRND4xgoDh2NeSl5esHeS9NgzmM0eR4DpvyzEg3CLhko/eP5rODHKeCIJIf5w4uqqC6Ssec/uzkf1b7C3/nhKNcVIYV9PamU55AerEzAVdqwW6Fhvd4eohmjT5d/TSHUy+ER3S/flvVthzzMfgEvayExfLKIB9vI8B+7SuB8lSDWZ7zjQpqHDGhzEXXI/GFl1g9FiLnQagQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UDNsbWREJRglxVN+GZUDGkpZy1FD/DD1GlQNx54gjyo=; b=kCiUQFPG5SkjZsNdEkybKWb4PD1fbmyoY7kUBTsGFj0WBwHKPbkqq/HrADARQKolhfG4sUCOnptp7k3+TNHKZWK1aOVJ94s2pssrL9wKi3JYnsi36OkKXjt7dKtId5hDlj3DZfAt7wiUvC1UwLtrdoUZ9qRX/wN1H9+gEElQ6MuEw68ZO49nARdijemuGzAE858lddbNNpHYSe2ysqubZtGb88K4QSO47g+rkk8WCwtiv28GFm5ynV+IXOSCPcAO4OZJhfRwAN8Bq2otWeIU8K3CfJ+TOo9Uqqq4bAumsfyJOInEzbBmwDP0nLp+pRB+qsovyfRlJkJq2EE9zlO4oQ== Received: from CH0P221CA0014.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::12) by MN6PR12MB8490.namprd12.prod.outlook.com (2603:10b6:208:470::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:57:25 +0000 Received: from DS3PEPF0000C380.namprd04.prod.outlook.com (2603:10b6:610:11c:cafe::73) by CH0P221CA0014.outlook.office365.com (2603:10b6:610:11c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 12:57:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF0000C380.mail.protection.outlook.com (10.167.23.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:57:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:57:06 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:57:04 -0700 From: Xueming Li To: Arkadiusz Kusztal CC: Ciara Power , dpdk stable Subject: patch 'crypto/qat: fix crash with CCM null AAD pointer' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:16 +0800 Message-ID: <20240413125005.725659-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C380:EE_|MN6PR12MB8490:EE_ X-MS-Office365-Filtering-Correlation-Id: d28f1e92-5dde-48d4-4f42-08dc5bb9448c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0sQMNytpGlrTfuOAsL2lNeYZGVwBmnxBoR67W7S3sQLxvTDI3avcm+ly6MBznpYFWOJBYJsWKezYvIcpJ4XAzFp029XOLbWZHHv4EQgE4ADLIzGNqxzUR0scQce6rgAUnuveM9p1dI42L2xHY+DKnGSbLCDx4ecKaxH72VM4xhmEGYbq+0TwgU0TuaudZSkB/oRt93jhfxL9LmYkd2ovRDeTnLEtcOE3lGJaZKM/rZjlG4lWDCSv6czRwhag4vth3f79c2MGIs8jU7F1AFdsov8ZQ4kNFzfNmEQpxsKz1FPlf15C7tG9lPiRQDD8DyL5cw9w2GYop0Xmcx8VICwmQLbxD417P+t2KJV3e1FOQ2jR6bi6wUs7jUC/+gs1Pi/R0Vab9MI4wiKClEfOcYdjnZOv5oTnrnXuV8jWB9NmUM17QIYmDPceYlD+28iei7HNsW/qJj1rlWVwGm8h0Pb4uk3JMQ7FX5wqdALTPa9njCip+680+a1/zTVbE62+iP/rABZMUceJA+IuNrAZtEQIse7MoOvkPW4JHgBFcXgmaU5hLAUuQrq/xo/hGtEAbK0ZxtnFV1tsoIJUHz1b89v5uAk5P1hfXuHopVI9Kgzj9laL1h6gjeBUvebuWGXewo28tLb/2NYyqRYEAWPUG/T8xc4bI37OatPPoNZBLhFDywpT2GK8HE7pG+zE5tOYnhcgm1/Tfurn7erP8OCJWNEiz0Bm/2Ag48QQXn2SJ/YZeD3+Kl/qw9a1/zRhoRDOUeUd X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:57:25.5484 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d28f1e92-5dde-48d4-4f42-08dc5bb9448c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C380.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8490 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 Hi, FYI, your patch has been queued to stable release 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=72d3dfa9decb8de97c99c5c5ac2cd26413290d7e Thanks. Xueming Li --- >From 72d3dfa9decb8de97c99c5c5ac2cd26413290d7e Mon Sep 17 00:00:00 2001 From: Arkadiusz Kusztal Date: Fri, 8 Mar 2024 08:25:12 +0000 Subject: [PATCH] crypto/qat: fix crash with CCM null AAD pointer Cc: Xueming Li [ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ] This commit fixes a segfault, that occurs when NULL pointer is being set to the AAD pointer field. Fixes: a815a04cea05 ("crypto/qat: support symmetric build op request") Signed-off-by: Arkadiusz Kusztal Acked-by: Ciara Power --- drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h index b8ddf42d6f..24044bec13 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h @@ -894,10 +894,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx, *(uint8_t *)&cipher_param->u.cipher_IV_array[0] = q - ICP_QAT_HW_CCM_NONCE_OFFSET; - rte_memcpy((uint8_t *)aad->va + - ICP_QAT_HW_CCM_NONCE_OFFSET, - (uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET, - ctx->cipher_iv.length); + if (ctx->aad_len > 0) { + rte_memcpy((uint8_t *)aad->va + + ICP_QAT_HW_CCM_NONCE_OFFSET, + (uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET, + ctx->cipher_iv.length); + } break; default: break; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.327076989 +0800 +++ 0076-crypto-qat-fix-crash-with-CCM-null-AAD-pointer.patch 2024-04-13 20:43:05.027753892 +0800 @@ -1 +1 @@ -From e90ef1803bb34768d1446e756046020e8cbce4bc Mon Sep 17 00:00:00 2001 +From 72d3dfa9decb8de97c99c5c5ac2cd26413290d7e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 60b0f0551c..1f5d2583c4 100644 +index b8ddf42d6f..24044bec13 100644 @@ -22 +24 @@ -@@ -925,10 +925,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx, +@@ -894,10 +894,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx,