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 40FD446A63 for ; Thu, 26 Jun 2025 14:03:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39B0F400D6; Thu, 26 Jun 2025 14:03:13 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2068.outbound.protection.outlook.com [40.107.93.68]) by mails.dpdk.org (Postfix) with ESMTP id 0C704400D6 for ; Thu, 26 Jun 2025 14:03:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R49CPzUXhOVPH6INZbkZAn+MhC13BgPcHMKOBaSl+1E+vwahFOCh2fsoEr/Fv9YGduJokHyZZR7bGyG9wB4bqXuUjGktdC3JmbGZrYQtpII68o6YtJt1AMqOhBCRTcFW5XycUTDNRoIATgNg/YEpDrjlrPqtKbgeSD+OzcB+ZwoxKcrUfFTBwI/Pjvs7P9QedLTef9T3Q3osQyfhXMe/1VL0dOxGm7wspBxn5a7NJRMtUHrH4/LIBmVUh81Ji/uBYYNf2J5fyprocJAfTk2F0EkPAlgUGLOQObrMRMr+377ttMdxiGYw79pwYpeQ6m8sV5kduBUOThN1eQ0kgA6PSw== 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=Wam3lSXPxkbBVOArj/EoVkgAbtYTW7ewfRnfzHbyBnw=; b=R7iPclzg6RnPZrITxOR/ZrnUv1FvvaULL4LVjMiNkl/V2vlpOJHID9WaQUSxxLJXuWy8GxUDWjgaQPkPecBJrUyC5asrevhCpXtPWY4P8CXXKObx4sJdIdNX2K4dxFbO5ZNiogr0HC7IZAnWsLHiB73HtxDtdx+l6ZDLREjwFMSvB9XL5Ck/gJK85lHxwIMln4v0ftF5XKeOaPfNQG+slUAx+MWf7cZlmMuu5rS7HhX4rCpgTdBJPmqqr2lztw/hymnZP4RAjRXDPyDryjoYSMdlrxmqQBf611CuZxPIYJmeMHY6WZc7YZKHwcNACqMy/LVHOhDmxUyhslJSGts0Pw== 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=Wam3lSXPxkbBVOArj/EoVkgAbtYTW7ewfRnfzHbyBnw=; b=DbBEthCLvWAzIIsnbG2IccWbU5fTIR+SEV2Q1is40NWlDvUv/ZtKeylpaYlkddHcCNmb6BtZ+FiUItvr0I5gF/hE3dZ80qtWimmV5kTKAnE67RARer2o1OL69VbuC3LLumMptQZDZkzXhQxDxLBTbU1bXLlFBT2Rcev0CU55YxPQT8btDvTO3FuF3VDWG9P6EtT8T1cBOG/hCg35hm1Mn28KFE4o89VbnO1cs27LR6tKCSkGbZ/zsVdZRwrF6EWgAEb2dh5Eqg1GZIPqmHqyqvzUEjbrJ117MGk8ELf/4l+rbQiroQch4jAHwW/0+K5FHGGWhob6tfPrxCu8P+iggA== Received: from DS7PR05CA0048.namprd05.prod.outlook.com (2603:10b6:8:2f::19) by CH3PR12MB8074.namprd12.prod.outlook.com (2603:10b6:610:12b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.16; Thu, 26 Jun 2025 12:03:09 +0000 Received: from CY4PEPF0000EE39.namprd03.prod.outlook.com (2603:10b6:8:2f:cafe::1a) by DS7PR05CA0048.outlook.office365.com (2603:10b6:8:2f::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.10 via Frontend Transport; Thu, 26 Jun 2025 12:03:09 +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 CY4PEPF0000EE39.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:03:09 +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; Thu, 26 Jun 2025 05:02:51 -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.1544.14; Thu, 26 Jun 2025 05:02:49 -0700 From: Xueming Li To: Yuan Wang CC: Xueming Li , Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix EEPROM dump' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:30 +0800 Message-ID: <20250626120145.27369-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: CY4PEPF0000EE39:EE_|CH3PR12MB8074:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d48f69e-8e1a-4787-e7dc-08ddb4a96b39 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DZETm6vxZS/KbylpUg+QRTGYvoPsVZoMY4Uwh5oowXkIso+FgkS7eMJivVxg?= =?us-ascii?Q?1CtpAXMtyeBX7HVIeOWa3zmLkLpjOgqaSXSm1A+/PCldE+NgN22A4a3mvsN7?= =?us-ascii?Q?IuIoZWblJOZOIFZBaFy02CMzQGmdoccudVOM9671Yyq1mK46hrxOKasabzxM?= =?us-ascii?Q?xKuSm2I/oNreN2VKGYKvp+2lUZ5ODfdtiZT8KYOq4iqPuVXmdoVJLZHWLF5Q?= =?us-ascii?Q?8/5rWVZwQJ5oGnNE4Dtru0RSnoGPdqZmuzDMr4zKv+xouq7MfXkdWsxYCk+S?= =?us-ascii?Q?JFbgEVdafF6lwSlmVIuOVIA/MmBinr063xtNbFP1eLXGl8EHl+9sZpx9fu5f?= =?us-ascii?Q?7npH3ARDttzXnv1d2mDHwb+z+wUcnsYM+8lIg5uWJYW4Qyp5/gxtDUPcmGXT?= =?us-ascii?Q?hYCmN/Ey0SpZ0L6J5pW5TuSYVCvrGJ7J/9SGKtQa6du5cGJxpvahar8N5uAg?= =?us-ascii?Q?Vbon7+wnsazB/sfD2m8wyuIrs6J/ShmutljOIVpBGwahi9sToRd1wwsmhRxb?= =?us-ascii?Q?Xtg2iCNnhZqRg75dULo6+pI3l5ajd3nki57bKa44ArNO3LFYQttL4W6w6i3d?= =?us-ascii?Q?FJU9ITzpTqmwnvMAWEaUHjfx1DiG3dkUnquQHBt/PUWvrbk//HN3ZaEgHalp?= =?us-ascii?Q?A+ssEWdxFE0GOBiwrrNp6RIBWf0sw2O8uszsELMLKJAGLmIgeuJovEn0EGgH?= =?us-ascii?Q?QCyiVoArIK0ur2z++rRrofWeUP2urTl4hXpu6d3i8tomP1HF0IGGmkILI/7y?= =?us-ascii?Q?SFPl5XhjHNC4KTFVUbQ5Cgm2E/3eI8kbyR2io5FNpBbzu3FL5K+Q2jdDnj/Z?= =?us-ascii?Q?g222G+Pl7RJFeaJYyUtjGfknpHO77lCe8CwHGbiruUFkP5cOpFwuKKuLh/si?= =?us-ascii?Q?fjVpt/Rh2y9Y/7qtQMzqbmSCEwtVJsAtShpH1A1qg8cEY/cbhU9uJLTjM0Ws?= =?us-ascii?Q?l/N7mMTXi45lIX9mZrgLfNsUBcNBq3VAqBSsnyVYrfoSZCUTfy5sYNdwJJo4?= =?us-ascii?Q?p2TdttYujB+zot10SJj7FaCbbyzaEc8FbCJADGQiMyN5bzItLJIwhf2Vwv5d?= =?us-ascii?Q?Fi36GEUvtx6mQAC9xBGdvPCfT0yhznF2iCBGYcjgsemK94W3UZv5fX9BTo47?= =?us-ascii?Q?CiRY4OxjEsGTrB9e19H/9YXXLko/lSxukZys9/zXxxhuveu9iZ33bL0dCoc8?= =?us-ascii?Q?27I9VUIgjN/X/dHyH8u9JDZfP6VT6aYnlYYFo1tIYYDioTU1ODHVh/hXmeEk?= =?us-ascii?Q?oB7POcnjAssDJdWNY9PuZUr+y3aO7OBvBP2wo0jTlLUXv6qPiRdGC5ximYY2?= =?us-ascii?Q?+GfR+sJUMysZ+0dyHFORlEkG04QzzmXDGZEo4fp8yv6af/wfDayPoN1mXpjn?= =?us-ascii?Q?AUFVQQ3DYsGTKTi88wSxB2/apgvHLhEJ+0YkCuaQwZUcvWy49I4okLJFmIho?= =?us-ascii?Q?O/hYtIYfH56rviXB9QSPMpKL+cezqJb9H1mks5j/U6TxTscvirI6B206w+17?= =?us-ascii?Q?gTF3bCvkuT+lmzrYLVG50ocSxMF3dOec6AKWrOgra2NsMllqXVcJvLc1pw?= =?us-ascii?Q?=3D=3D?= 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)(376014)(36860700013)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:03:09.6868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d48f69e-8e1a-4787-e7dc-08ddb4a96b39 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: CY4PEPF0000EE39.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8074 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/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=b041be6b46f5c0c1504439de68e2dd5903381442 Thanks. Xueming Li --- >From b041be6b46f5c0c1504439de68e2dd5903381442 Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Tue, 15 Apr 2025 15:48:02 +0800 Subject: [PATCH] net/e1000: fix EEPROM dump Cc: Xueming Li [ upstream commit b3855b93dcc890f40dce3b688f5a331dcd8d14e8 ] There is a incorrect comparison in get_eeprom that cause EEPROM dump fail. Allow valid case when "first + offset == word_size". Fixes: 83c314da4c38 ("igb: add access to specific device info") Signed-off-by: Yuan Wang Acked-by: Bruce Richardson --- drivers/net/e1000/igb_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index b7fdbef56e..f8207f34a6 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5149,7 +5149,7 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev, first = in_eeprom->offset >> 1; length = in_eeprom->length >> 1; if ((first >= hw->nvm.word_size) || - ((first + length) >= hw->nvm.word_size)) + ((first + length) > hw->nvm.word_size)) return -EINVAL; in_eeprom->magic = hw->vendor_id | -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:18.162217012 +0800 +++ 0010-net-e1000-fix-EEPROM-dump.patch 2025-06-26 19:59:17.202418052 +0800 @@ -1 +1 @@ -From b3855b93dcc890f40dce3b688f5a331dcd8d14e8 Mon Sep 17 00:00:00 2001 +From b041be6b46f5c0c1504439de68e2dd5903381442 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b3855b93dcc890f40dce3b688f5a331dcd8d14e8 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -15 +17 @@ - drivers/net/intel/e1000/igb_ethdev.c | 2 +- + drivers/net/e1000/igb_ethdev.c | 2 +- @@ -18,5 +20,5 @@ -diff --git a/drivers/net/intel/e1000/igb_ethdev.c b/drivers/net/intel/e1000/igb_ethdev.c -index 40f453c8d9..cb892fbf91 100644 ---- a/drivers/net/intel/e1000/igb_ethdev.c -+++ b/drivers/net/intel/e1000/igb_ethdev.c -@@ -5219,7 +5219,7 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev, +diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c +index b7fdbef56e..f8207f34a6 100644 +--- a/drivers/net/e1000/igb_ethdev.c ++++ b/drivers/net/e1000/igb_ethdev.c +@@ -5149,7 +5149,7 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev,