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 C3D26468E4 for ; Thu, 12 Jun 2025 23:08:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEC3642DD9; Thu, 12 Jun 2025 23:08:15 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id B119142DD9 for ; Thu, 12 Jun 2025 23:08:14 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a53ee6fcd5so895596f8f.1 for ; Thu, 12 Jun 2025 14:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762494; x=1750367294; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fp1JbMx5dzWleBxwl2z+VIkT7NjvN8n9A4NmDzwRSwY=; b=UbuhHocY+Xn9vFudJkfPQTLu/4rDvF+pOc86k9nclYWC1NszlCJTjjmJbnUsm0z/HR riO+VCUfnVhzhw6yeCEomvtaZ7GYAB2EJVqLW6SDh9IBer8L3d6hs1nxxDK0fGI7qvmx kBCDiFTDH957D+FFwDyvRnF0ysDrt8FGfWYHZssUhLCrQDNY7DI2uFe7CofHvzma6Wsp /+4HJ3IpVGZ3gR+yn3WVZQREUGNtFvb6R+SdVxbI2POR6P3UJ6E3ClBMeJvo5fEM7/gQ 9VxfzdqIMA9cDMyu+/mFvkTjG4mTbCXl0JDUCgEWdWj0mzHhikVqTDAoxXKov5PGm8mB R4ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762494; x=1750367294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fp1JbMx5dzWleBxwl2z+VIkT7NjvN8n9A4NmDzwRSwY=; b=W8MO4XmyZTdeXP5MtgP0WadC7tdcG/rCT9G/6mYnffd8UaDkf2L/d5dMsAJ8D88ms0 gk6uyTBX8AkCxCMR+DuP0KIMyeUKpADixBJW90HEG1oaSEw5Hto334697b+mqCgfs3uA V9btV8I2TB3vGEw1W3uV/TEqm6K/5jwz+NenJMERc8H8MYUjxQurVZi6JO7YGJU9mLGf ngY+k7QugQZF46vyC+zK9iIC0vcZf6YwHipFYADKyoG+Hii5UlOv2u0evwVYoDMdo3zf QjIrhlDJwFHOVN7Qui2yeVwlSzj3nVRH1j+USAx6VSKw6cra4tpH7NDd4hqGcHqH3Qxq fRPA== X-Forwarded-Encrypted: i=1; AJvYcCUWWdjGr6sTNLeBbZ4PstVB7SxILfQmtZ1UoXD7AjlNIeu7c7INIt2KkCROcNcV/PpB0AMt+6k=@dpdk.org X-Gm-Message-State: AOJu0Yxv0ENH14ISzEy9A4JiUjJFL0HBOS9OQDOyaj2ai3uZKdQgvYnp r+Zt5K0zNimGLTv6GuNPBwrKFMoMWhNZiO7k/CaaT0hUngoYB+nIjo3R1ivj4BUs X-Gm-Gg: ASbGncsqXAmeYuSk03ucoQ3VY8qD4CulLFSyRDfAUWFXYs5tX+0gVwUvBF9wI63oDj3 3HGskquBQ/2C8IMHEl6vu7wgt0M49aBuBErNLEnfcKRiNZosZyjk2Ejq563Bgwufg+OYy9Agze9 LtlcrJvD6sAkrMQQf1fLdFB1Ep2t/hlRppVnpyHHg03KUw2WZfUwk3H1qiJZAPB+ZHLEe3vL2GQ 7dOoQMO3aLnD/quGhQnPjKM+iMtoWYs/X6Jn8VWGXX7f2GhCZyEQ7qGcy9buQ9fnkAb2zgzCVYu Gm49olH3fHe0KXP+A4qcVh9RZVuu4HF3xNwAeMpsA3R8lzuVNn+UpiyJCzTsSl3AoBeZ X-Google-Smtp-Source: AGHT+IH0RnPpPlrSckc6CeZk02m+l6PKyvOjUC3z+IUGR7acczea6sTgZaXyuPUd4Wm7W+C/g5ZS4g== X-Received: by 2002:a05:6000:4026:b0:3a5:2b75:56cc with SMTP id ffacd0b85a97d-3a568670e87mr558476f8f.23.1749762494233; Thu, 12 Jun 2025 14:08:14 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b3c0d3sm366872f8f.79.2025.06.12.14.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:08:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Yuan Wang Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix EEPROM dump' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:28 +0100 Message-ID: <20250612210733.2506558-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9d5f84abd670d5c047d78dd7685b65174d05d6a7 Thanks. Luca Boccassi --- >From 9d5f84abd670d5c047d78dd7685b65174d05d6a7 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 b5df7473cd..19ae64af13 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:24.308275045 +0100 +++ 0011-net-e1000-fix-EEPROM-dump.patch 2025-06-12 22:06:23.802043202 +0100 @@ -1 +1 @@ -From b3855b93dcc890f40dce3b688f5a331dcd8d14e8 Mon Sep 17 00:00:00 2001 +From 9d5f84abd670d5c047d78dd7685b65174d05d6a7 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 -@@ -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 b5df7473cd..19ae64af13 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,