Drop queue-5.15/hid-hid-thrustmaster-fix-warning-in-thrustmaster_pro.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/hid-hid-thrustmaster-fix-warning-in-thrustmaster_pro.patch b/queue-5.15/hid-hid-thrustmaster-fix-warning-in-thrustmaster_pro.patch
deleted file mode 100644 (file)
index 0888ea7..0000000
--- a/queue-5.15/hid-hid-thrustmaster-fix-warning-in-thrustmaster_pro.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1685085fa45cc66b0726797c63313896cfe58869 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 5 Dec 2024 23:22:21 +0100
-Subject: HID: hid-thrustmaster: Fix warning in thrustmaster_probe by adding
- endpoint check
-
-From: Karol Przybylski <karprzy7@gmail.com>
-
-[ Upstream commit 50420d7c79c37a3efe4010ff9b1bb14bc61ebccf ]
-
-syzbot has found a type mismatch between a USB pipe and the transfer
-endpoint, which is triggered by the hid-thrustmaster driver[1].
-There is a number of similar, already fixed issues [2].
-In this case as in others, implementing check for endpoint type fixes the issue.
-
-[1] https://syzkaller.appspot.com/bug?extid=040e8b3db6a96908d470
-[2] https://syzkaller.appspot.com/bug?extid=348331f63b034f89b622
-
-Fixes: c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")
-Reported-by: syzbot+040e8b3db6a96908d470@syzkaller.appspotmail.com
-Tested-by: syzbot+040e8b3db6a96908d470@syzkaller.appspotmail.com
-Signed-off-by: Karol Przybylski <karprzy7@gmail.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hid/hid-thrustmaster.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/hid/hid-thrustmaster.c b/drivers/hid/hid-thrustmaster.c
-index 2221bc26e611a..d11297640fe08 100644
---- a/drivers/hid/hid-thrustmaster.c
-+++ b/drivers/hid/hid-thrustmaster.c
-@@ -170,6 +170,14 @@ static void thrustmaster_interrupts(struct hid_device *hdev)
-       ep = &usbif->cur_altsetting->endpoint[1];
-       b_ep = ep->desc.bEndpointAddress;
- 
-+      /* Are the expected endpoints present? */
-+      u8 ep_addr[1] = {b_ep};
-+
-+      if (!usb_check_int_endpoints(usbif, ep_addr)) {
-+              hid_err(hdev, "Unexpected non-int endpoint\n");
-+              return;
-+      }
-+
-       for (i = 0; i < ARRAY_SIZE(setup_arr); ++i) {
-               memcpy(send_buf, setup_arr[i], setup_arr_sizes[i]);
- 
--- 
-2.39.5
-

diff --git a/queue-5.15/series b/queue-5.15/series
index ca07655da9dfcb27c3e6af2a1e65f81c7e226fe7..fa6fc978e4fa20e22bb24282327d600f5ae68135 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ udp-deal-with-race-between-udp-socket-address-change.patch
 clk-imx8mp-fix-clkout1-2-support.patch
 team-prevent-adding-a-device-which-is-already-a-team.patch
 regulator-of-implement-the-unwind-path-of-of_regulat.patch
-hid-hid-thrustmaster-fix-warning-in-thrustmaster_pro.patch
 samples-landlock-fix-possible-null-dereference-in-pa.patch
 wifi-wlcore-fix-unbalanced-pm_runtime-calls.patch
 net-smc-fix-data-error-when-recvmsg-with-msg_peek-fl.patch