patch 'net/e1000: fix EEPROM dump' has been queued to stable release 23.11.5
Xueming Li
xuemingl at nvidia.com
Thu Jun 26 14:00:30 CEST 2025
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 <xuemingl at nvidia.com>
---
>From b041be6b46f5c0c1504439de68e2dd5903381442 Mon Sep 17 00:00:00 2001
From: Yuan Wang <yuanx.wang at intel.com>
Date: Tue, 15 Apr 2025 15:48:02 +0800
Subject: [PATCH] net/e1000: fix EEPROM dump
Cc: Xueming Li <xuemingl at nvidia.com>
[ 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 <yuanx.wang at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
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 <xuemingl at nvidia.com>
+
+[ upstream commit b3855b93dcc890f40dce3b688f5a331dcd8d14e8 ]
@@ -10 +12,0 @@
-Cc: stable at 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,
More information about the stable
mailing list