From: Greg Kroah-Hartman Date: Fri, 16 Aug 2024 07:01:24 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.19.320~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8adbf4e5559d7dd24deae4bdf091a55ac7e24538;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: media-revert-media-dvb-usb-fix-unexpected-infinite-loop-in-dvb_usb_read_remote_control.patch --- diff --git a/queue-5.10/media-revert-media-dvb-usb-fix-unexpected-infinite-loop-in-dvb_usb_read_remote_control.patch b/queue-5.10/media-revert-media-dvb-usb-fix-unexpected-infinite-loop-in-dvb_usb_read_remote_control.patch new file mode 100644 index 00000000000..97d98dfc488 --- /dev/null +++ b/queue-5.10/media-revert-media-dvb-usb-fix-unexpected-infinite-loop-in-dvb_usb_read_remote_control.patch @@ -0,0 +1,117 @@ +From 0c84bde4f37ba27d50e4c70ecacd33fe4a57030d Mon Sep 17 00:00:00 2001 +From: Sean Young +Date: Thu, 8 Aug 2024 10:35:19 +0200 +Subject: media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()" + +From: Sean Young + +commit 0c84bde4f37ba27d50e4c70ecacd33fe4a57030d upstream. + +This reverts commit 2052138b7da52ad5ccaf74f736d00f39a1c9198c. + +This breaks the TeVii s480 dual DVB-S2 S660. The device has a bulk in +endpoint but no corresponding out endpoint, so the device does not pass +the "has both receive and send bulk endpoint" test. + +Seemingly this device does not use dvb_usb_generic_rw() so I have tried +removing the generic_bulk_ctrl_endpoint entry, but this resulted in +different problems. + +As we have no explanation yet, revert. + +$ dmesg | grep -i -e dvb -e dw21 -e usb\ 4 +[ 0.999122] usb 1-1: new high-speed USB device number 2 using ehci-pci +[ 1.023123] usb 4-1: new high-speed USB device number 2 using ehci-pci +[ 1.130247] usb 1-1: New USB device found, idVendor=9022, idProduct=d482, ++bcdDevice= 0.01 +[ 1.130257] usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 +[ 1.152323] usb 4-1: New USB device found, idVendor=9022, idProduct=d481, ++bcdDevice= 0.01 +[ 1.152329] usb 4-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 +[ 6.701033] dvb-usb: found a 'TeVii S480.2 USB' in cold state, will try to ++load a firmware +[ 6.701178] dvb-usb: downloading firmware from file 'dvb-usb-s660.fw' +[ 6.701179] dw2102: start downloading DW210X firmware +[ 6.703715] dvb-usb: found a 'Microsoft Xbox One Digital TV Tuner' in cold ++state, will try to load a firmware +[ 6.703974] dvb-usb: downloading firmware from file 'dvb-usb-dib0700-1.20.fw' +[ 6.756432] usb 1-1: USB disconnect, device number 2 +[ 6.862119] dvb-usb: found a 'TeVii S480.2 USB' in warm state. +[ 6.862194] dvb-usb: TeVii S480.2 USB error while loading driver (-22) +[ 6.862209] dvb-usb: found a 'TeVii S480.1 USB' in cold state, will try to ++load a firmware +[ 6.862244] dvb-usb: downloading firmware from file 'dvb-usb-s660.fw' +[ 6.862245] dw2102: start downloading DW210X firmware +[ 6.914811] usb 4-1: USB disconnect, device number 2 +[ 7.014131] dvb-usb: found a 'TeVii S480.1 USB' in warm state. +[ 7.014487] dvb-usb: TeVii S480.1 USB error while loading driver (-22) +[ 7.014538] usbcore: registered new interface driver dw2102 + +Closes: https://lore.kernel.org/stable/20240801165146.38991f60@mir/ + +Fixes: 2052138b7da5 ("media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()") +Reported-by: Stefan Lippers-Hollmann +Cc: stable@vger.kernel.org +Signed-off-by: Sean Young +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +++---------------------------- + 1 file changed, 4 insertions(+), 31 deletions(-) + +--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c ++++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c +@@ -23,40 +23,11 @@ static int dvb_usb_force_pid_filter_usag + module_param_named(force_pid_filter_usage, dvb_usb_force_pid_filter_usage, int, 0444); + MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID filter, if any (default: 0)."); + +-static int dvb_usb_check_bulk_endpoint(struct dvb_usb_device *d, u8 endpoint) +-{ +- if (endpoint) { +- int ret; +- +- ret = usb_pipe_type_check(d->udev, usb_sndbulkpipe(d->udev, endpoint)); +- if (ret) +- return ret; +- ret = usb_pipe_type_check(d->udev, usb_rcvbulkpipe(d->udev, endpoint)); +- if (ret) +- return ret; +- } +- return 0; +-} +- +-static void dvb_usb_clear_halt(struct dvb_usb_device *d, u8 endpoint) +-{ +- if (endpoint) { +- usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, endpoint)); +- usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, endpoint)); +- } +-} +- + static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) + { + struct dvb_usb_adapter *adap; + int ret, n, o; + +- ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint); +- if (ret) +- return ret; +- ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint_response); +- if (ret) +- return ret; + for (n = 0; n < d->props.num_adapters; n++) { + adap = &d->adapter[n]; + adap->dev = d; +@@ -132,8 +103,10 @@ static int dvb_usb_adapter_init(struct d + * when reloading the driver w/o replugging the device + * sometimes a timeout occurs, this helps + */ +- dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint); +- dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint_response); ++ if (d->props.generic_bulk_ctrl_endpoint != 0) { ++ usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint)); ++ usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint)); ++ } + + return 0; + diff --git a/queue-5.10/series b/queue-5.10/series index 25885afa674..eeb18331e5d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -350,3 +350,4 @@ vdpa-make-use-of-pfn_phys-pfn_up-pfn_down-helper-mac.patch vhost-vdpa-switch-to-use-vmf_insert_pfn-in-the-fault.patch wifi-cfg80211-restrict-nl80211_attr_txq_quantum-valu.patch arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch +media-revert-media-dvb-usb-fix-unexpected-infinite-loop-in-dvb_usb_read_remote_control.patch