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 81491457A1 for ; Mon, 12 Aug 2024 14:57:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A9C2402C3; Mon, 12 Aug 2024 14:57:00 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) by mails.dpdk.org (Postfix) with ESMTP id F1FA04029C for ; Mon, 12 Aug 2024 14:56:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=O7FQVyqpy6XaIAF4iXypyccQ4fE6WSEKrYx085IjcErDizjX9jT2TESGplvdd5ljTSXx/0zqi6RwxZ9if+TsM9vjr9N/f79fIjeAI4qSAiuHO+itz9b4jHhURtobW68VPDUWab1NANRl0MSvprbp1KQd0CW9qCM10B5p6rHH+ASXrylEmzM06uFryy8DdQNrYK1BSLpwSzdBD20xyg0QtA6n/PyOSGg5J7agYGZrIRL2CyP+74r6p93QiyyxqAQkYJaM2l3RuQ+wd9WTzpDnVi65K5sgEKBnlH7zD9QQb4vbp5gcXB4x6MWBXOJqz+bSH4JNvNYQIzcwDjK3Gw1oDA== 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=rs01l7yUB4mbXeVhk+kiJDZ68CAxuAojTHrMoFp9Xh0=; b=x4PyJ0kOt6UrYykwBFNC9Xb2BpiMl1Bo0/Zs7hIfpVfiTzLoXJAkLVLYoRi2Axx502jV9fvrZTs9opzmy1sDmQSMYRo9C1vXXfq8J6zeOaE0fYPqwiu+NksOIGcDp6M3rhpHxK0oPiaMsePxmEjaRUfed+oUbpYO736jdddYytlEJ3gtiNtkAVjgjFljfmg9TcD45GiNl+CbeokHG6N8/qxUd7xM92z0Sx3yh5ULpqzd19fsx8Lzu/v0cSHN0/o/pSqwiYB5L972NUpvhVWBSz3aqh4Ts4gNhLHrYDmbr9+dGoBKLOjlympiYf2NK4JOOOcigB97wV2FH3YzLJOe2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=rs01l7yUB4mbXeVhk+kiJDZ68CAxuAojTHrMoFp9Xh0=; b=Yg0L4mD99E5y6rbnSbp5F9q3fTjs8J+uylG12H2SZdINEH+DFfJiW4KQrch5eV8xHgpaLKoUvpX1RZpgb+X3FOuuUDs/XG1Lne7tt4LBc/yxM/cN8iVrnCOd/FXT+2j/TM2BWBiU0ZVapq1lq/AALW067UCIvTWLuoKqapBqtNjwZ/qabL/xABA5zfohCSXZ3NV1FJWVA2XoSi04JCGMzbTQX3/vugDS4OpuIwpuC5NNM+Wps959ixT/9HxyzpkOKkzXrGazXLRtxVcvBIn0mbfHN7S1LZLDhun4ipw6rPR/G/yPKLHmZSni++kjOhV9aWjLMY8Q9K29iIx2TxX3IQ== Received: from DM6PR14CA0072.namprd14.prod.outlook.com (2603:10b6:5:18f::49) by IA0PR12MB8088.namprd12.prod.outlook.com (2603:10b6:208:409::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:56:56 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:18f:cafe::36) by DM6PR14CA0072.outlook.office365.com (2603:10b6:5:18f::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:56:56 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:56:55 +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.1544.4; Mon, 12 Aug 2024 05:56:45 -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; Mon, 12 Aug 2024 05:56:43 -0700 From: Xueming Li To: Soumyadeep Hore CC: , Bruce Richardson , "dpdk stable" Subject: patch 'common/idpf: fix PTP message validation' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:00 +0800 Message-ID: <20240812125035.389667-64-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: 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: DS1PEPF0001708F:EE_|IA0PR12MB8088:EE_ X-MS-Office365-Filtering-Correlation-Id: 5842ece1-7934-4314-cda9-08dcbace3ede X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?v2n2iICr9LG2FbZr8KnhYyNjpkZY0pzYJ1P2m8o7jbGlk4nqDPh4szYfQGcU?= =?us-ascii?Q?cDxteGJvC+FTSQpdImR+lkikc2QIRdmZpejZGbFNufxdDrfEHAWzK4UEPthp?= =?us-ascii?Q?6809msd/2mVNujqTuM0I8OJU6LvOJOs/ttp29vkzEg4ShjDuDHAJ6Gd+Gp9J?= =?us-ascii?Q?yOcnH2MDcqKcQt3TCSvdks8YbO63TPGwa9yR8tq5c2dtnBsRPq/EXVilrvVc?= =?us-ascii?Q?2pmhd2DYjQqmNTZBpi9VMZqQ88Mhcae0udhIRpGmigNcMgydiUUy0kvM16XA?= =?us-ascii?Q?Uca4ZZwX+fJKttn0/ARa9y6DuJGs/wn6v8rMRVNu+D+Dhx5FzPQooi2h955G?= =?us-ascii?Q?48NktPNGpjc/YcOHKN8ynNhQAp4M5sHkhgA3WVfH8i8/NEmB9kJI4Gt4uEKv?= =?us-ascii?Q?W7KwlJL7Y7cPx+fmROWWnkxUj5UvhQqyYCoWA5998F52Xvmpng4PtWIeL9Lu?= =?us-ascii?Q?hlx/oomhubZusjWoL5o9jGc14a5ox4cWvu0k2rDptsd8oAoo1s/s3bPUv43X?= =?us-ascii?Q?tjTfJnDOv0WdSsIGwqPxhLp/xbEx448uircfo0KYnkKw9Anr6mA3XVgckAlg?= =?us-ascii?Q?Cq0HYbhfWySH2ZMRP2HEus3VGaWCADZYPqqgseOYbUR8NIgU697nLTWek+nJ?= =?us-ascii?Q?ji0LAgEej7uqRtR2sxA6pdepJgXmj17kD4s0j5IgwuZ2DrqE7y3h/pi74xW+?= =?us-ascii?Q?6cjBuhsCRuve9eBnI6RxU4JVbJ5Bf6VMNPTkgnzmxrynv6arJkSmTnzllBjl?= =?us-ascii?Q?np2aIFC85Sfh0ovguHVMbV47mOvMe8+Fa4qzHtyFNsqjmUxPJhwirb2gcAQE?= =?us-ascii?Q?avKKcSSZBSglK5mhRhdrhfK8UDQi70LZixG+Gm3nPVR48PWdORRJTUpRaIG4?= =?us-ascii?Q?xtybzYFxpFYVv7gsfpg2955jjoLzlaMPKlVpIa0MYf+hC7nJh3Qk+/6UWuaU?= =?us-ascii?Q?y2Q96+8t7PVmbCOwdUXiumpuatxk3kAVobDo7Z+GpUfJ4uyGNnTFGvO3xRjh?= =?us-ascii?Q?v/ZF7BqA5+6yJ6/tTXOmhUXU+pTg3EOEcDFsTNQxLEL8rvJa4edKHl4KuWS2?= =?us-ascii?Q?2oQ44M20kaWKa3alVaQ/eE2DRhnocfve3Z1YZdEUKrkBWPDyGBMNgCxAwRlE?= =?us-ascii?Q?vPmw40QrW9qqsIidstkqwiKNzRAaOVKZ1JhS3EibfDNF8j9v64/IGT5RwlZ7?= =?us-ascii?Q?ih2AZskj48/+NVgdBg2rOwIr1yPmkr3y0gvVBQKSeFSZjkB1KTw1Gl+JQs9b?= =?us-ascii?Q?/NrFI4S+gy0a+t5yBp2rQ6eMtEe/nSYZyDtR1OgvmFU164DjlASJ8dcX7qw2?= =?us-ascii?Q?dww5aH0Ujk+HECYCZnhYNBUDMwn6a8bp+IcsexHXkSulMJV/zxIKU62GACDp?= =?us-ascii?Q?sX+Ky62W4it4VC71kJ9crQyvDKyf02d+EcCb8jGWOwA5MdVYGvr82ycYltFc?= =?us-ascii?Q?ETu+cDhu92zWa0SkisPMTh0wnWYldSNW?= 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:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:56:55.9179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5842ece1-7934-4314-cda9-08dcbace3ede 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8088 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.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 08/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=39b2b4c7de880511a0cbe5a3412d49328380b100 Thanks. Xueming Li --- >From 39b2b4c7de880511a0cbe5a3412d49328380b100 Mon Sep 17 00:00:00 2001 From: Soumyadeep Hore Date: Mon, 24 Jun 2024 09:16:36 +0000 Subject: [PATCH] common/idpf: fix PTP message validation Cc: Xueming Li [ upstream commit 420cde5c539eb8bc9936a482404fc29f4d53c5e1 ] When the message for getting timestamp latches is sent by the driver, number of latches is equal to 0. Current implementation of message validation function incorrectly notifies this kind of message length as invalid. Fixes: 3f72f4472b57 ("common/idpf/base: initialize PTP support") Signed-off-by: Soumyadeep Hore Acked-by: Bruce Richardson --- drivers/common/idpf/base/virtchnl2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/idpf/base/virtchnl2.h b/drivers/common/idpf/base/virtchnl2.h index 3900b784d0..21b2039aa2 100644 --- a/drivers/common/idpf/base/virtchnl2.h +++ b/drivers/common/idpf/base/virtchnl2.h @@ -1872,7 +1872,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3 case VIRTCHNL2_OP_GET_PTP_CAPS: valid_len = sizeof(struct virtchnl2_get_ptp_caps); - if (msglen >= valid_len) { + if (msglen > valid_len) { struct virtchnl2_get_ptp_caps *ptp_caps = (struct virtchnl2_get_ptp_caps *)msg; @@ -1888,7 +1888,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3 case VIRTCHNL2_OP_GET_PTP_TX_TSTAMP_LATCHES: valid_len = sizeof(struct virtchnl2_ptp_tx_tstamp_latches); - if (msglen >= valid_len) { + if (msglen > valid_len) { struct virtchnl2_ptp_tx_tstamp_latches *tx_tstamp_latches = (struct virtchnl2_ptp_tx_tstamp_latches *)msg; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.638477030 +0800 +++ 0063-common-idpf-fix-PTP-message-validation.patch 2024-08-12 20:44:02.135069302 +0800 @@ -1 +1 @@ -From 420cde5c539eb8bc9936a482404fc29f4d53c5e1 Mon Sep 17 00:00:00 2001 +From 39b2b4c7de880511a0cbe5a3412d49328380b100 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 420cde5c539eb8bc9936a482404fc29f4d53c5e1 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index e76ccbd46f..24a8b37876 100644 +index 3900b784d0..21b2039aa2 100644 @@ -24 +26 @@ -@@ -2272,7 +2272,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3 +@@ -1872,7 +1872,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3 @@ -33 +35 @@ -@@ -2288,7 +2288,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3 +@@ -1888,7 +1888,7 @@ virtchnl2_vc_validate_vf_msg(__rte_unused struct virtchnl2_version_info *ver, u3