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 01D0C46532 for ; Tue, 8 Apr 2025 10:17:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF5E340A89; Tue, 8 Apr 2025 10:17:11 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2072.outbound.protection.outlook.com [40.107.244.72]) by mails.dpdk.org (Postfix) with ESMTP id EBF0F40A89 for ; Tue, 8 Apr 2025 10:17:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cxRgWjmzvb3k1DbbUBQXEpkMLLnSRVHhexShdCCMRw2t0YKOcgzLAPPcy/8kwyfl/vMdZ20305t9/shKxzcdiYruXO3XtV11ZJPttOSM5EET/eLdn07IT8KtWyQy7PwNxOoEr8C9YwXLCosRK3R60GfqoDRA/nBGDhdDNlWv4Mk5wY9JX5PFBeDo0AAS9gO4OMfUMy0uQZ7TahyLCkHRZ8veCKmhZ7FtO6PJQjoxRvR3FvcnBELwbil2N6SwJ4aLmv2vUANyz25JVYVDDuc9Swmcqylww5s2AhBazR9rEIeuLm3oTYp/a8lzyL9e+8VDzIdVelkLVeYDJDyuOdJlXw== 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=ElR0yIA9rcAOStdEBKGLmmSc/pKSezDtCk2pGHAzuoI=; b=DeN5iz/d0fy3L2RVTggdwgpwuSDwM5bKEcIED034M2mO/ItCiOQjPt8t+SatczihuQAnx0Ymizdsw4F3+XlaU2P1hC22o+j7a75YdvpL6q5r2bMpwhkzrHRBrJsrrzHgsDEw4xQcx4VsOOCfiYLtezx/WlnKGFqDv9hHom7UqPbKeIhCRckSxzNjFLs1lXTA//CLUexX3WUtrA11DIeyWOeFuJsYOsdQYDMgO6LDVAZY28ca0n5DVgl34OzdUNV8ytcJf5bDipYg1x+tuD8A0+Pk6jUEnvKNEN802w35Uhg4La3SMUOYHi1HUGh0CEJSQ3qJ2ua8O+8r5kIyXL3HHQ== 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=ElR0yIA9rcAOStdEBKGLmmSc/pKSezDtCk2pGHAzuoI=; b=o3dPkZhM1zyuCO5Na2+tTMt2qWHr9ZCDVAuqf5lbgg9IEDQbuwuTb8rW8CvekcTsyCcykMoqidZ85PEqaSrrsJmfWypbKvPqUqZwxekawPuWEl4HTX91BPbAf5CBqL2BoP4rVuSMRyFDApCBUdVDq6t+KtRbBMaordWwC9qigRs8Fofb2aqnqCs7v1uw+TVgEOH6sRh6LpNBndWaaxrz9LtU5VTRHvFk9yHPLJzmAraCoQAY2O13zc5dvkaxH6lpp4E5msccFh/zyUMZpTBbbxvm1QnoiajHql9GlVkkSUbjYlWsk+RMYdCDEQvp/0jLqi8aHyLbpXD++uUs3rTJCw== Received: from CH5PR05CA0007.namprd05.prod.outlook.com (2603:10b6:610:1f0::12) by LV8PR12MB9641.namprd12.prod.outlook.com (2603:10b6:408:295::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 08:17:07 +0000 Received: from CH1PEPF0000A34C.namprd04.prod.outlook.com (2603:10b6:610:1f0:cafe::24) by CH5PR05CA0007.outlook.office365.com (2603:10b6:610:1f0::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.13 via Frontend Transport; Tue, 8 Apr 2025 08:17:07 +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 CH1PEPF0000A34C.mail.protection.outlook.com (10.167.244.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 08:17:07 +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; Tue, 8 Apr 2025 01:16:55 -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.14; Tue, 8 Apr 2025 01:16:51 -0700 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'examples/ptpclient: fix message parsing' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:16:23 +0800 Message-ID: <20250408081625.377877-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408081625.377877-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408081625.377877-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: CH1PEPF0000A34C:EE_|LV8PR12MB9641:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c1b91d2-8d05-4c0a-2dbf-08dd7675c0d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?P7G6ROrNJhHqZn1f+iB1MKuJ9bSS644MRYdXDO44X0QQLPsLc92utxxJG9hv?= =?us-ascii?Q?k/GM7bQGOXYnGC8omfR78USkKuHxvBFpy/5j8OAE51nJUNkT7qPDnE/sVUa3?= =?us-ascii?Q?6ZDHjEoEAcTGTrDiPS4giTqmYQ0MqsC7yXB+BW1xGU/ZNSWVQ6DKAkbxJBSj?= =?us-ascii?Q?9AQiqRcr+iNcvgUFnCduni0eZVAR8coLStLC+/1U/MNOJxo0NDUIujXxh0Hw?= =?us-ascii?Q?mExh8ObEhMHMNY9UoWOEauGNYtyQzXu6mTI/VZsO1vOqqitm2KOEAzb+iNE+?= =?us-ascii?Q?tnieLrC1JxOVM89PiN2Nfgvk8G1pwjrfEAQK7pt0WFaAJ/YNzidKK8bTS+Fi?= =?us-ascii?Q?fNApjtABmPNjaXmP/ELBDC0qGNnkv9lIoLDsYMBNqsoTRNeGOxsh4ZBxIZSc?= =?us-ascii?Q?OKL+aZC+e3nn9wxZ4xM/glcISG1N4PplAhekHaxErmedi7WYY+cin0J8yA0i?= =?us-ascii?Q?qDyi5eTUb4CuWn4jTs24V4zEl1gsYOiq/YssTH6I4cMkU9F6FigsvDCoSnig?= =?us-ascii?Q?BYW6sMFbD3NXWmGa39rCU583TvQQ5fh2FjCMEcCA4miRHEn5tgi6Sb0PeqGP?= =?us-ascii?Q?oMMpvnHLx5P0PnuzIewwPcWmLTOogbmSdmyBvzYCqG4PM6Wc6L8cmqplVxDj?= =?us-ascii?Q?I9XK7bKYspdzdkV3aXiHa5MNs3G7WRHvBo6nIlE/sufwlIOj37V1WVjOCYyh?= =?us-ascii?Q?loEvDiBS9DmrengxTWalm33Da/+GFMRqov+DKPxjV+ERhpcfkrgdJErdjVoM?= =?us-ascii?Q?0hAqtpBN3sa7iDl7LpRReDybR6bWyIxXOnvhvl8OgvE7nb/7G5eiCc5WOG2z?= =?us-ascii?Q?+n6VUbCfYEt5/+r8ddZt7AnN/uzIULFYjrDxOGeiBWD+jtKjwmFgK4LwdBvk?= =?us-ascii?Q?3UXjZxiixvgky1cdrhN9Qd/wV9MZ+8A5NFxNMPKdl0Wm86ciLwqQIfUsTZ+4?= =?us-ascii?Q?vSU1y3bYt1f8OfSHTMmHGtjRDTUv2j25b+yG51eyPM9RnXNvBYdKv0qqLxbC?= =?us-ascii?Q?J+WrmTsGp2qWe15FYzv7GtiN00LFxlS8xQgUvdvfB6TESf5q0uII4X/d1DbA?= =?us-ascii?Q?qPuBAbArcaQZ+AOViMB873FKuUA/a0YK0f+vwPTTmZkN1W+bPKuZU3ww6hLs?= =?us-ascii?Q?LcJ4mSwDA/oqDDCTEc0pyG9rH90QAaF/+FEbGWKJZHJDvJsbHmF7EOnsl1ec?= =?us-ascii?Q?HcYbzreQNr8wW6qWUvA/rVJiNvTEaT2uhJ5bwhr65Vqo6Q15AKIRDrF/xqb5?= =?us-ascii?Q?oxpVycyHKN96CIBWirK+MMqV0s86xE5z5EAzSRqWfLElyu0gKlkMthwZH6xT?= =?us-ascii?Q?A9vjOWmduKAfXyoqXlFwA0Tuv0EJMWmtE9lpIvA2wHD1VIMKwfbN3YvGa0ZW?= =?us-ascii?Q?+BacZlyKOnuxKMa/xRDjyoAcq0nIg74totcXIbCQTP6gKfxd/R8wptqhlrhH?= =?us-ascii?Q?JFYxae+dj7nrdJXmzPPDVnIFBHk1qNOVdFh5j3x4oufKydr1DdojVbAmH+Gt?= =?us-ascii?Q?cyYZGA5xaUQ3f1Fmggtc6F7Scvyt1sdjrlzE?= 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)(82310400026)(36860700013)(376014)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:17:07.3035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c1b91d2-8d05-4c0a-2dbf-08dd7675c0d0 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: CH1PEPF0000A34C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9641 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.4 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/10/25. 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=1f52611f51fe885417b25c13665ea26ede2a2276 Thanks. Xueming Li --- >From 1f52611f51fe885417b25c13665ea26ede2a2276 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 19 Feb 2025 09:16:05 -0800 Subject: [PATCH] examples/ptpclient: fix message parsing Cc: Xueming Li [ upstream commit 19630bd0d735badb06143086d4f1c50d726b7bad ] Calling memcmp on same structure will always be true. Replace with same conditional used elsewhere. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: ab129e9065a5 ("examples/ptpclient: add minimal PTP client") Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da64df..92b54f240e 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -365,7 +365,7 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) ptp_data->ptpset = 1; } - if (memcmp(&ptp_hdr->source_port_id.clock_id, + if (memcmp(&ptp_hdr->master_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) == 0) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:07.246833755 +0800 +++ 0046-examples-ptpclient-fix-message-parsing.patch 2025-04-08 15:39:06.046436542 +0800 @@ -1 +1 @@ -From 19630bd0d735badb06143086d4f1c50d726b7bad Mon Sep 17 00:00:00 2001 +From 1f52611f51fe885417b25c13665ea26ede2a2276 Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Wed, 5 Feb 2025 08:23:10 -0800 +Date: Wed, 19 Feb 2025 09:16:05 -0800 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 19630bd0d735badb06143086d4f1c50d726b7bad ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 27d06dd91d..c344e7db1e 100644 +index cdf2da64df..92b54f240e 100644 @@ -23 +25 @@ -@@ -367,7 +367,7 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx +@@ -365,7 +365,7 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) @@ -28 +30 @@ -+ if (memcmp(&ptp_data->transmitter_clock_id, ++ if (memcmp(&ptp_hdr->master_clock_id,