drop xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch

Not needed.

diff --git a/queue-6.6/series b/queue-6.6/series
index 908e367d64ae20d1613917ac9f968a407345c949..9f21b1bd48caf1f33fc40ffbb8b378f830bb0d6f 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -4,7 +4,6 @@ dmaengine-ti-k3-udma-report-short-packet-errors.patch
 dmaengine-fsl-qdma-fix-a-memory-leak-related-to-the-.patch
 dmaengine-fsl-qdma-fix-a-memory-leak-related-to-the-.patch-14769
 phy-renesas-rcar-gen3-usb2-fix-returning-wrong-error.patch
-xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
 perf-evlist-fix-evlist__new_default-for-1-core-pmu.patch
 dmaengine-fix-is_slave_direction-return-false-when-d.patch
 phy-ti-phy-omap-usb2-fix-null-pointer-dereference-fo.patch

diff --git a/queue-6.6/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch b/queue-6.6/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
deleted file mode 100644 (file)
index 0bbc452..0000000
--- a/queue-6.6/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c845fa4315cb8501de56de8658d11ab5194c2f6b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 25 Jan 2024 17:27:35 +0200
-Subject: xhci: fix off by one check when adding a secondary interrupter.
-
-From: Mathias Nyman <mathias.nyman@linux.intel.com>
-
-[ Upstream commit 09f197225cbc35db8ac135659cdd21bc1e29bda0 ]
-
-The sanity check of interrupter index when adding a new interrupter is
-off by one. intr_num needs to be smaller than xhci->max_interrupter to
-fit the array of interrupters.
-
-Luckily this doesn't cause any real word harm as xhci_add_interrupter()
-is always called with a intr_num value smaller than xhci->max_interrupters
-in any current kernel.
-
-Should not be needed for stable as 6.7 kernel and older only supports
-one interrupter, with intr_num always being zero.
-
-Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
-Closes: https://lore.kernel.org/linux-usb/e9771296-586d-456a-ac24-a82de79bb2e6@moroto.mountain/
-Fixes: 4bf398e15aa4 ("xhci: split allocate interrupter into separate alloacte and add parts")
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
-Link: https://lore.kernel.org/r/20240125152737.2983959-3-mathias.nyman@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/host/xhci-mem.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 0a37f0d511cf..0e5a1be009fc 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -2270,7 +2270,7 @@ xhci_add_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir,
-       u64 erst_base;
-       u32 erst_size;
- 
--      if (intr_num > xhci->max_interrupters) {
-+      if (intr_num >= xhci->max_interrupters) {
-               xhci_warn(xhci, "Can't add interrupter %d, max interrupters %d\n",
-                         intr_num, xhci->max_interrupters);
-               return -EINVAL;
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 409b0c67f6e4f8982c45e9f214eebbd3b7a71ded..1b69314fc3701733536b706435ef367512887de8 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -8,7 +8,6 @@ phy-qcom-qmp-usb-fix-serdes-init-sequence-for-ipq601.patch
 phy-renesas-rcar-gen3-usb2-fix-returning-wrong-error.patch
 perf-tests-add-perf-script-test.patch
 perf-test-fix-perf-script-tests-on-s390.patch
-xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
 perf-evlist-fix-evlist__new_default-for-1-core-pmu.patch
 dmaengine-fix-is_slave_direction-return-false-when-d.patch
 phy-ti-phy-omap-usb2-fix-null-pointer-dereference-fo.patch

diff --git a/queue-6.7/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch b/queue-6.7/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
deleted file mode 100644 (file)
index 07fd770..0000000
--- a/queue-6.7/xhci-fix-off-by-one-check-when-adding-a-secondary-in.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b7b4de7b1fca79555ff324d34ff46257bf2b7b52 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 25 Jan 2024 17:27:35 +0200
-Subject: xhci: fix off by one check when adding a secondary interrupter.
-
-From: Mathias Nyman <mathias.nyman@linux.intel.com>
-
-[ Upstream commit 09f197225cbc35db8ac135659cdd21bc1e29bda0 ]
-
-The sanity check of interrupter index when adding a new interrupter is
-off by one. intr_num needs to be smaller than xhci->max_interrupter to
-fit the array of interrupters.
-
-Luckily this doesn't cause any real word harm as xhci_add_interrupter()
-is always called with a intr_num value smaller than xhci->max_interrupters
-in any current kernel.
-
-Should not be needed for stable as 6.7 kernel and older only supports
-one interrupter, with intr_num always being zero.
-
-Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
-Closes: https://lore.kernel.org/linux-usb/e9771296-586d-456a-ac24-a82de79bb2e6@moroto.mountain/
-Fixes: 4bf398e15aa4 ("xhci: split allocate interrupter into separate alloacte and add parts")
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
-Link: https://lore.kernel.org/r/20240125152737.2983959-3-mathias.nyman@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/host/xhci-mem.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 62116586848b..9f27adb255e8 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -2286,7 +2286,7 @@ xhci_add_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir,
-       u64 erst_base;
-       u32 erst_size;
- 
--      if (intr_num > xhci->max_interrupters) {
-+      if (intr_num >= xhci->max_interrupters) {
-               xhci_warn(xhci, "Can't add interrupter %d, max interrupters %d\n",
-                         intr_num, xhci->max_interrupters);
-               return -EINVAL;
--- 
-2.43.0
-