From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6CB2B45610
for <public@inbox.dpdk.org>; Fri, 12 Jul 2024 12:46:15 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 63E4D402E5;
Fri, 12 Jul 2024 12:46:15 +0200 (CEST)
Received: from NAM11-BN8-obe.outbound.protection.outlook.com
(mail-bn8nam11on2053.outbound.protection.outlook.com [40.107.236.53])
by mails.dpdk.org (Postfix) with ESMTP id 39E2740261
for <stable@dpdk.org>; Fri, 12 Jul 2024 12:46:14 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=qv1hjM4JFQssglqwDAkWNSa41sY+3gJwigm26/TkfWr1btJJ1Jt9S6MTeiMNs+1z1TzO8uIqAE0a84ts8Tngo97FgjX58v2haheGwG7IEs9Uvx+BIfmz5/0olgLOHBzg8PROTmSzVE09A/jZ6/hztf93rvltHTBhYOK+U3yd+Xmb6ySirw3fQPBGXNjnnMbOJtKRXiPEAmokTWjSCYxTdwBpppD4G9i1dtYMBrWYGX370rap/CyY0b5E5X01rdQKzM6JAuV8TcwpaTVTOZNZWUFiFAejBAswK1taTiy400QBYlvPYsixWTie1QNsK7VzcbVt7xhHXf3lCyvSSukvrA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
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=hfN3S/Bu37M5erXiAgojRrQm0obVPOO+bH9xshcgB98=;
b=OcS/YZbjm7oLNDwB20TogU1koL61qBGrddb/P0R5cwaenm6atFNW2XRsC1S/ph+T12oaqrX+6avegp0Efy7N5ekWo68KoT3wx+bC0xJ7TCf/psxzcuG7xEwxCqiZJ6S6CtUd/jJbxpTSYnMQrXnWIUriYssXUM3UtIPv1pACColcwOpP1nZ+pMioEt+dWg8r0icjF6WQl+fJFiBih56Lx6voYjQxZLTAKuUujMU9jdh3gABpPL4dNuk8Oolzl6MYDiv9ALMY0JGuxOryUoL58Rjv3VHfAsvTt5GdeeuQd278XuI34iHLTIewC7m0cLk+ifJcCmJ2FumGEf0qrwkh1w==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.117.161) smtp.rcpttodomain=networkplumber.org
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=hfN3S/Bu37M5erXiAgojRrQm0obVPOO+bH9xshcgB98=;
b=S0kghdOPNPSEnylH37bguDfCGVi+3jZSa4O0F82zQmjFfgnE6++OUDawfZBQuwgNQSdlNRgxDxK5x3bBi29+GBJU/XUDhdYXsHptCR/4nMCF45hSCXcO0sdh5hZ/zTw5V0GxFoq9PoalgxLtzg6EkPdd0hvxPbaRa38DOR6xAOjVpwzhnNivLWs7hUyCOtU3NJ1kzIYY5tgV48sRofxiMxHVOxOkEElc2KZXC4KOhvJmiehfkAlh+y2FLEEzjdrFjKhnS3w+zoGHIKR6Irm5lwgSSmuaLRUG67g1NRSq7g0mmsdMW5IMf2SW9upkrrVEfahq8AKvtPWftj6RD6TmOg==
Received: from CH0PR03CA0050.namprd03.prod.outlook.com (2603:10b6:610:b3::25)
by MN2PR12MB4454.namprd12.prod.outlook.com (2603:10b6:208:26c::18)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24; Fri, 12 Jul
2024 10:46:10 +0000
Received: from CH1PEPF0000A34B.namprd04.prod.outlook.com
(2603:10b6:610:b3:cafe::11) by CH0PR03CA0050.outlook.office365.com
(2603:10b6:610:b3::25) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24 via Frontend
Transport; Fri, 12 Jul 2024 10:46:10 +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
CH1PEPF0000A34B.mail.protection.outlook.com (10.167.244.10) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:46:10 +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.1544.4; Fri, 12 Jul
2024 03:45:53 -0700
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.1544.4; Fri, 12 Jul
2024 03:45:51 -0700
From: Xueming Li <xuemingl@nvidia.com>
To: Stephen Hemminger <stephen@networkplumber.org>
CC: dpdk stable <stable@dpdk.org>
Subject: patch 'pcapng: add memcpy check' has been queued to stable release
23.11.2
Date: Fri, 12 Jul 2024 18:43:50 +0800
Message-ID: <20240712104528.308638-5-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com>
References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34B:EE_|MN2PR12MB4454:EE_
X-MS-Office365-Filtering-Correlation-Id: 9a48a75a-83e7-4fb1-7dda-08dca25fd7c7
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|36860700013|82310400026|1800799024|376014;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rVGn/P1udjnChuHfyKE0EzI1IZYFEArA1ZkKprQNvQ0nDoq5xS2MaHqTxiXb?=
=?us-ascii?Q?c30ZRYXYmFeZJATUzE4xnld1xRs/MjcTY+le7ZwJNmhTVfTknzDFUAv/xvE8?=
=?us-ascii?Q?LDhGgfJuS5/OA2kfBmfYflAjcfBQ1v+TSfqovveu6WS358+AsXJaaHYnpeC7?=
=?us-ascii?Q?BDvRPVEMMEzkO5HXLwXCCgQ1cqkEKooJCdaeKYxz1yc4iKahLIONj+nCLXWi?=
=?us-ascii?Q?l9n5tcPW1zZ+OWF872ik6kFQniBjtsVlTELyq0Zn3AToGWAx9nW1JgjJYQ5C?=
=?us-ascii?Q?rkUHllkSNT8Ijjb609SoEYeOZT4+v2enkNLOi43zStJS+JRGtH504G3GtzoN?=
=?us-ascii?Q?9ZcjCqDcn2nNZ4HRAdn66QACTWmfKLPKGUvzqmxR3pV/OEoA0+ghdMfptbb9?=
=?us-ascii?Q?el0BdNcHh7fnj+yMzstAqm1Kd+xjd4OI/U0g9tykoO5UHi31p70g6RRfoe03?=
=?us-ascii?Q?eTMCta69RNcaS1W4XCtNtFqX0LxewxMk/jbiBerW3z9cee2N1n1/RLXnEcmM?=
=?us-ascii?Q?li7uvs8GVpQsMx836BwtS8KCRSny/oy45kyvDzhe82AGPci5F4SNy4b8LI25?=
=?us-ascii?Q?z465jQU7yvACH0+gpBep813c3QcbZts+gQYPJzcPmu3YDV9uVJLEiDXJVgnL?=
=?us-ascii?Q?5/Bn8O5ngp1qjvEs40OQYUXDVBxUCziBNlFJLfrlMG8T1ruF8/yh8SJusOL+?=
=?us-ascii?Q?Kr0pZvRy5saJqki285QB4R8ECBz86/CpWV03+R1UsSwHykUkZNeiqU/9BWzO?=
=?us-ascii?Q?EyyUAHajMIL+HJZpyHEepprmQFOY0cLNyOONwaBXMosA/fW1q5Lh+g5Cs5cX?=
=?us-ascii?Q?S4DbqP1zZ7pIu834hYY2LOceg1jmJg5AQrd92EOznus04hSe8Zj1qwmEKGD+?=
=?us-ascii?Q?quta6Ra8mYGpPlXEPRiCKDS7vF2QcWpZ2nwMzT9bLCWFPHmMWzpbnLAj44ZW?=
=?us-ascii?Q?zbTesdppzw29qHQlRn8+skXs+Vcmnf5KCqLPOnzIjjnlVhtjWA54ohUE7kS1?=
=?us-ascii?Q?bdTGpyF468xD+3onbYAohDDbXbvr+e1g5QN6sbnGcQfDgietNM/xKjl/VHX8?=
=?us-ascii?Q?VbqIFov7uCeFeca13HNG+pApq04eXnFPG0Kuro1VNy45GWFWqlgz/8wm5d7z?=
=?us-ascii?Q?lEtzz761luf2IXFh8g8IU80vokXYtZuT6mMX8KKPk01YJ1hVPbtgD1ApTChj?=
=?us-ascii?Q?1xEmYPrH1YH6uvIGsnBkjEoUvWEmPwnKu4Yp6k+Mbs9z7CmiPDItA3QadSxa?=
=?us-ascii?Q?HlxGzMafGj7zMuZ4RKR40NYjDqDuyhmNalU1/75IZAdl/w/5fC1W/TpudoWS?=
=?us-ascii?Q?PbaEpiI7Yrn66QcX5Je+99NnRtXFa8OfoXzKu9bgnYRCIydLpGKBW0wCSxSN?=
=?us-ascii?Q?n/6ff/h2Hc/SJTG5+eo3HjHzdPvRCMjHkPz4bGLRkkJ7JDQHKR3XSyK9PgyB?=
=?us-ascii?Q?yAuhVqg0PcLcCn47q5nFWIc3qI4UQoxt?=
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:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT;
SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:10.3973 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 9a48a75a-83e7-4fb1-7dda-08dca25fd7c7
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: CH1PEPF0000A34B.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4454
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 23.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/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=385cf6a859cf218d4d0186b9d633abbaac70c2bb
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From 385cf6a859cf218d4d0186b9d633abbaac70c2bb Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 20 May 2024 18:01:03 -0700
Subject: [PATCH] pcapng: add memcpy check
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd ]
When adding option with no data, the rte_pcapng_add_option would
call memcpy with src of NULL and size of zero. This generates a
warning if fortify is enabled.
Bugzilla ID: 1446
Fixes: 8d23ce8f5ee9 ("pcapng: add new library for writing pcapng files")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/pcapng/rte_pcapng.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index f74ec939a9..7254defce7 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -128,7 +128,8 @@ pcapng_add_option(struct pcapng_option *popt, uint16_t code,
{
popt->code = code;
popt->length = len;
- memcpy(popt->data, data, len);
+ if (len > 0)
+ memcpy(popt->data, data, len);
return (struct pcapng_option *)((uint8_t *)popt + pcapng_optlen(len));
}
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-12 18:40:14.577311370 +0800
+++ 0004-pcapng-add-memcpy-check.patch 2024-07-12 18:40:13.906594251 +0800
@@ -1 +1 @@
-From 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd Mon Sep 17 00:00:00 2001
+From 385cf6a859cf218d4d0186b9d633abbaac70c2bb Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd ]
@@ -12 +14,0 @@
-Cc: stable@dpdk.org