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 576C843B86 for ; Tue, 5 Mar 2024 10:51:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 523F342D3F; Tue, 5 Mar 2024 10:51:17 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2045.outbound.protection.outlook.com [40.107.95.45]) by mails.dpdk.org (Postfix) with ESMTP id 90E3C4026B for ; Tue, 5 Mar 2024 10:51:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4JuXsiemb5VEfFE64DRDjWCiphEJCn9NGZAFMB7+v7wra2KO3evC9hFvWd28Y5+i2qQQhNp/THbb73pJ3y3v7/gMtvPUj/O7KdxZWU5Tfzr4K493YHwYBXn+XeVgbDe9iuhjzh5on0KisA/qM9BJgcxuLdg8o0H4NaBFDYYwIT8nBx+M4HTKpcL0nmHD+yMnxARGeJa4qwEZjD19MkXmu2ursS21AfOM9mhHilGM8PjBejNx00x8JseSVkxSSeD2hAqR/OW/1XrqYKXPIaWlbGse3deYqoChgQMWKYN1E0pCiiHrRVuL44fN2cVqXt5e3te3qiMqIZYf9Z8yW9d2A== 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=D9v82CkmHh0RvRmtNDm329zOtRtWmLsTJ0PkWdJN7i4=; b=mYXepivAzLQ2RzqYejGA4Fr3EYtD84wqbZ6kEJqBDPYDX6Y/lDxAk4VlSos6mtbEi+54/tru+eJG4nttVpaL3NO+cMbJ9YeAdmB7JFIAxzJyNXCNqyqa6XUV9UPv4vK9kUScmF8VCSWT82jm+BAk+WN6V1oJtjZqFkNd1DcmpTDE/Uk/MAkJyp+9Nbf9bbAnvKSqgRUKaVTTc11EdOn4v5JQvSGPYy5hiX+wjiOEl3bf88uDXc00YC3+ce5UnbnlEn4jH9Re2x+/QYI18i+bp8nMOHY51Pv3r8Wwirm0oZu+JIyX2hzWVgfUK7qDn0B+ZGrHOZA6cEr2JFiZammHhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.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=D9v82CkmHh0RvRmtNDm329zOtRtWmLsTJ0PkWdJN7i4=; b=OR5c6XDqxbl2TsqUzGqQU6saQlXKQHOqC2J7q7Ifn/KpNun6oXQod6hlOzRDWSuQcogYzsH9ppe9HSMkFpGjm0BEL6BUxUUYpYlbFMFVzrofpRZ4d+j7HWKERBzQwHu2RhdDNoxAm2j4ecuWFsc5PvkOmA4+efspWwIRs1XkRaCjX+5UxZ2ZZf6VugrE6oUjZXS7t8M0RPIFOj+fNPQnt/iCPyscMz419+PtzaTOWVBRDXHtO0jBFrabUx+l3bUbm3n+W8lLLHPkVlNCl7KJMBBmEDQJtSiOMdtxU92QfgQnwOTbTyyQY7EsnF4JBplvQPyRpJ+8HpKfc+9PD+lavA== Received: from DS7PR05CA0108.namprd05.prod.outlook.com (2603:10b6:8:56::27) by DM6PR12MB4185.namprd12.prod.outlook.com (2603:10b6:5:216::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:51:12 +0000 Received: from CY4PEPF0000FCC4.namprd03.prod.outlook.com (2603:10b6:8:56:cafe::bd) by DS7PR05CA0108.outlook.office365.com (2603:10b6:8:56::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:51:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000FCC4.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:51:12 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:51:00 -0800 Received: from nvidia.com (10.126.231.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; Tue, 5 Mar 2024 01:50:58 -0800 From: Xueming Li To: Chengwen Feng CC: Chaoyong He , dpdk stable Subject: patch 'net/nfp: verify strdup return' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:14 +0800 Message-ID: <20240305094757.439387-34-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC4:EE_|DM6PR12MB4185:EE_ X-MS-Office365-Filtering-Correlation-Id: afdb5c92-6ab1-4e60-0619-08dc3cf9cadc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 06eBEG62mGCDlfksV7K5ThMFBvRu40zXBgYSafsh9ZupW8NOvw7D7tC63Fl4CQEhDs0hvFyTlsJHAfsPO0mBsTsj540ZDFSRHs2XiRk9mxAFbwbU+FARVWdECW1zzG0ByyraJQGHyRqSWKuwVPnqpgaSk4rEAtNYdlRPXkN4D512BErIob6/apQY8J08KP/NMewu1LXzg3O+xwBcVs2I/QqfoFoE/C8uH07URKAiX7YuVWyHiVTi6tCK62s8Tn5E5n4WstMtYaVTf21w4o7wIqBxM0abYrQctLXXZ6JZ05m14UIvTZzKdM+tjsNmt/SuCaj2IPvtQaj8jXXWiq7O7Ve9pOQXNLQBtk0gyARXuhuVbezdt1TY7iFL6wdTAwQKf2j2h2pvuuv3XP4MuLWCb8brB0eFFWHmiUKTIxLJhnEgpx96z94a/6W0h/RERbwNnmUn6qA4ArRLekGCUj2F80RYf+hXAcYxGJICbI5EXKz6/Bd9NtrpuqMwXd1WsBpEOuYA/SeEYXb/ZAPvsKvO0eMOvknaC3C1SWDgtg5sbffnxtmMbSValhQj0546tepOM1dfxrpI7g7Ad2DNGd73EfZ4owI2sIpSBEgKznVnNArA1BkcGEdyoQWFeM/kXVLD9dqwJRkSiIgJPHXzagxKEpHfcK1TmTLbt/NzWwv+Y6X59u87ADV1m0DAhNx2Vj1cL/jmSRbuzluneLl8a9uL6ATeVJLuQeQayVlx7FdO4cYjGpBsQlLIR61HgcXQbZqr X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:51:12.6301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: afdb5c92-6ab1-4e60-0619-08dc3cf9cadc 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4185 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 03/31/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=c6790ef542674b526824592b3b04ed46a804fcc9 Thanks. Xueming Li --- >From c6790ef542674b526824592b3b04ed46a804fcc9 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:09 +0000 Subject: [PATCH] net/nfp: verify strdup return Cc: Xueming Li [ upstream commit 4ea9eeb66170b30eb5bf02f91531f08aecd13298 ] Add verify strdup return value logic. Fixes: 3d21da66c06b ("net/nfp: create security session") Signed-off-by: Chengwen Feng Acked-by: Chaoyong He --- drivers/net/nfp/nfp_ipsec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index 452947380e..7ce9cca0b2 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -524,6 +524,11 @@ nfp_aesgcm_iv_update(struct ipsec_add_sa *cfg, uint8_t *cfg_iv; iv_str = strdup(iv_string); + if (iv_str == NULL) { + PMD_DRV_LOG(ERR, "Failed to strdup iv_string"); + return; + } + cfg_iv = (uint8_t *)cfg->aesgcm_fields.iv; for (i = 0; i < iv_len; i++) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.043366235 +0800 +++ 0033-net-nfp-verify-strdup-return.patch 2024-03-05 17:39:30.723566491 +0800 @@ -1 +1 @@ -From 4ea9eeb66170b30eb5bf02f91531f08aecd13298 Mon Sep 17 00:00:00 2001 +From c6790ef542674b526824592b3b04ed46a804fcc9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4ea9eeb66170b30eb5bf02f91531f08aecd13298 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 6e9bb06aa6..0b815fa983 100644 +index 452947380e..7ce9cca0b2 100644 @@ -21 +23 @@ -@@ -526,6 +526,11 @@ nfp_aesgcm_iv_update(struct ipsec_add_sa *cfg, +@@ -524,6 +524,11 @@ nfp_aesgcm_iv_update(struct ipsec_add_sa *cfg,