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 DE6CA46BAE for ; Fri, 18 Jul 2025 21:33:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3E6340E30; Fri, 18 Jul 2025 21:33:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9809140E2D for ; Fri, 18 Jul 2025 21:33:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ptrOry1RjxoHKjLUl9HMow0X3M962OA8TDNAWuBdx5Y=; b=PRExEJLqkW5+E95cDbk9zExeVscD7z+crhhfULA+978MbkiKaYX1hw+lsgSvMUlUeZd7Yp zEx4MtrEYN7xujWBuYDlmLvxgIfP0M7gcT2YkYUgVVgvr8Blqks7w1EftOK6aUtFalDE7I ohuIA/8zKOlxTdj/Vq7fnbSQWB9ru0s= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-467-7_tGmjrUNKCPS51zwXI76A-1; Fri, 18 Jul 2025 15:33:15 -0400 X-MC-Unique: 7_tGmjrUNKCPS51zwXI76A-1 X-Mimecast-MFC-AGG-ID: 7_tGmjrUNKCPS51zwXI76A_1752867195 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 07C6F18001F7; Fri, 18 Jul 2025 19:33:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7435118003FC; Fri, 18 Jul 2025 19:33:13 +0000 (UTC) From: Kevin Traynor To: Yuan Wang Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix EEPROM dump' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:03 +0100 Message-ID: <20250718193247.1008129-9-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: J-EZiYQO_bErDF97bmzmadVpXabYpDBV5OPkPdT8o3Y_1752867195 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 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/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/aab056c1b81c12083373e1f25e01c176239eaaab Thanks. Kevin --- >From aab056c1b81c12083373e1f25e01c176239eaaab 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 [ 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 1d966d67eb..266d74b444 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5219,5 +5219,5 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev, 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; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.468168754 +0100 +++ 0009-net-e1000-fix-EEPROM-dump.patch 2025-07-18 20:29:10.812906969 +0100 @@ -1 +1 @@ -From b3855b93dcc890f40dce3b688f5a331dcd8d14e8 Mon Sep 17 00:00:00 2001 +From aab056c1b81c12083373e1f25e01c176239eaaab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3855b93dcc890f40dce3b688f5a331dcd8d14e8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/net/intel/e1000/igb_ethdev.c | 2 +- + drivers/net/e1000/igb_ethdev.c | 2 +- @@ -18,5 +19,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 -@@ -5220,5 +5220,5 @@ 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 1d966d67eb..266d74b444 100644 +--- a/drivers/net/e1000/igb_ethdev.c ++++ b/drivers/net/e1000/igb_ethdev.c +@@ -5219,5 +5219,5 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev,