From: Greg Kroah-Hartman Date: Sun, 18 Feb 2024 19:01:10 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.19.307~132 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40472186bfc2e6a46b3bf3ff0150963cf40a1c0c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: hid-wacom-do-not-register-input-devices-until-after-hid_hw_start.patch hid-wacom-generic-avoid-reporting-a-serial-of-0-to-userspace.patch mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch usb-f_mass_storage-forbid-async-queue-when-shutdown-happen.patch usb-hub-check-for-alternate-port-before-enabling-a_alt_hnp_support.patch --- diff --git a/queue-5.4/hid-wacom-do-not-register-input-devices-until-after-hid_hw_start.patch b/queue-5.4/hid-wacom-do-not-register-input-devices-until-after-hid_hw_start.patch new file mode 100644 index 00000000000..20295e95b62 --- /dev/null +++ b/queue-5.4/hid-wacom-do-not-register-input-devices-until-after-hid_hw_start.patch @@ -0,0 +1,147 @@ +From c1d6708bf0d3dd976460d435373cf5abf21ce258 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Mon, 29 Jan 2024 14:35:45 -0800 +Subject: HID: wacom: Do not register input devices until after hid_hw_start + +From: Jason Gerecke + +commit c1d6708bf0d3dd976460d435373cf5abf21ce258 upstream. + +If a input device is opened before hid_hw_start is called, events may +not be received from the hardware. In the case of USB-backed devices, +for example, the hid_hw_start function is responsible for filling in +the URB which is submitted when the input device is opened. If a device +is opened prematurely, polling will never start because the device will +not have been in the correct state to send the URB. + +Because the wacom driver registers its input devices before calling +hid_hw_start, there is a window of time where a device can be opened +and end up in an inoperable state. Some ARM-based Chromebooks in particular +reliably trigger this bug. + +This commit splits the wacom_register_inputs function into two pieces. +One which is responsible for setting up the allocated inputs (and runs +prior to hid_hw_start so that devices are ready for any input events +they may end up receiving) and another which only registers the devices +(and runs after hid_hw_start to ensure devices can be immediately opened +without issue). Note that the functions to initialize the LEDs and remotes +are also moved after hid_hw_start to maintain their own dependency chains. + +Fixes: 7704ac937345 ("HID: wacom: implement generic HID handling for pen generic devices") +Cc: stable@vger.kernel.org # v3.18+ +Suggested-by: Dmitry Torokhov +Signed-off-by: Jason Gerecke +Tested-by: Dmitry Torokhov +Signed-off-by: Jiri Kosina +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/wacom_sys.c | 63 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 43 insertions(+), 20 deletions(-) + +--- a/drivers/hid/wacom_sys.c ++++ b/drivers/hid/wacom_sys.c +@@ -2088,7 +2088,7 @@ static int wacom_allocate_inputs(struct + return 0; + } + +-static int wacom_register_inputs(struct wacom *wacom) ++static int wacom_setup_inputs(struct wacom *wacom) + { + struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev; + struct wacom_wac *wacom_wac = &(wacom->wacom_wac); +@@ -2107,10 +2107,6 @@ static int wacom_register_inputs(struct + input_free_device(pen_input_dev); + wacom_wac->pen_input = NULL; + pen_input_dev = NULL; +- } else { +- error = input_register_device(pen_input_dev); +- if (error) +- goto fail; + } + + error = wacom_setup_touch_input_capabilities(touch_input_dev, wacom_wac); +@@ -2119,10 +2115,6 @@ static int wacom_register_inputs(struct + input_free_device(touch_input_dev); + wacom_wac->touch_input = NULL; + touch_input_dev = NULL; +- } else { +- error = input_register_device(touch_input_dev); +- if (error) +- goto fail; + } + + error = wacom_setup_pad_input_capabilities(pad_input_dev, wacom_wac); +@@ -2131,7 +2123,34 @@ static int wacom_register_inputs(struct + input_free_device(pad_input_dev); + wacom_wac->pad_input = NULL; + pad_input_dev = NULL; +- } else { ++ } ++ ++ return 0; ++} ++ ++static int wacom_register_inputs(struct wacom *wacom) ++{ ++ struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev; ++ struct wacom_wac *wacom_wac = &(wacom->wacom_wac); ++ int error = 0; ++ ++ pen_input_dev = wacom_wac->pen_input; ++ touch_input_dev = wacom_wac->touch_input; ++ pad_input_dev = wacom_wac->pad_input; ++ ++ if (pen_input_dev) { ++ error = input_register_device(pen_input_dev); ++ if (error) ++ goto fail; ++ } ++ ++ if (touch_input_dev) { ++ error = input_register_device(touch_input_dev); ++ if (error) ++ goto fail; ++ } ++ ++ if (pad_input_dev) { + error = input_register_device(pad_input_dev); + if (error) + goto fail; +@@ -2381,6 +2400,20 @@ static int wacom_parse_and_register(stru + goto fail; + } + ++ error = wacom_setup_inputs(wacom); ++ if (error) ++ goto fail; ++ ++ if (features->type == HID_GENERIC) ++ connect_mask |= HID_CONNECT_DRIVER; ++ ++ /* Regular HID work starts now */ ++ error = hid_hw_start(hdev, connect_mask); ++ if (error) { ++ hid_err(hdev, "hw start failed\n"); ++ goto fail; ++ } ++ + error = wacom_register_inputs(wacom); + if (error) + goto fail; +@@ -2395,16 +2428,6 @@ static int wacom_parse_and_register(stru + goto fail; + } + +- if (features->type == HID_GENERIC) +- connect_mask |= HID_CONNECT_DRIVER; +- +- /* Regular HID work starts now */ +- error = hid_hw_start(hdev, connect_mask); +- if (error) { +- hid_err(hdev, "hw start failed\n"); +- goto fail; +- } +- + if (!wireless) { + /* Note that if query fails it is not a hard failure */ + wacom_query_tablet_data(wacom); diff --git a/queue-5.4/hid-wacom-generic-avoid-reporting-a-serial-of-0-to-userspace.patch b/queue-5.4/hid-wacom-generic-avoid-reporting-a-serial-of-0-to-userspace.patch new file mode 100644 index 00000000000..69c0d6b9ed6 --- /dev/null +++ b/queue-5.4/hid-wacom-generic-avoid-reporting-a-serial-of-0-to-userspace.patch @@ -0,0 +1,50 @@ +From ab41a31dd5e2681803642b6d08590b61867840ec Mon Sep 17 00:00:00 2001 +From: Tatsunosuke Tobita +Date: Thu, 1 Feb 2024 13:40:55 +0900 +Subject: HID: wacom: generic: Avoid reporting a serial of '0' to userspace + +From: Tatsunosuke Tobita + +commit ab41a31dd5e2681803642b6d08590b61867840ec upstream. + +The xf86-input-wacom driver does not treat '0' as a valid serial +number and will drop any input report which contains an +MSC_SERIAL = 0 event. The kernel driver already takes care to +avoid sending any MSC_SERIAL event if the value of serial[0] == 0 +(which is the case for devices that don't actually report a +serial number), but this is not quite sufficient. +Only the lower 32 bits of the serial get reported to userspace, +so if this portion of the serial is zero then there can still +be problems. + +This commit allows the driver to report either the lower 32 bits +if they are non-zero or the upper 32 bits otherwise. + +Signed-off-by: Jason Gerecke +Signed-off-by: Tatsunosuke Tobita +Fixes: f85c9dc678a5 ("HID: wacom: generic: Support tool ID and additional tool types") +CC: stable@vger.kernel.org # v4.10 +Signed-off-by: Jiri Kosina +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/wacom_wac.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/hid/wacom_wac.c ++++ b/drivers/hid/wacom_wac.c +@@ -2540,7 +2540,14 @@ static void wacom_wac_pen_report(struct + wacom_wac->hid_data.tipswitch); + input_report_key(input, wacom_wac->tool[0], sense); + if (wacom_wac->serial[0]) { +- input_event(input, EV_MSC, MSC_SERIAL, wacom_wac->serial[0]); ++ /* ++ * xf86-input-wacom does not accept a serial number ++ * of '0'. Report the low 32 bits if possible, but ++ * if they are zero, report the upper ones instead. ++ */ ++ __u32 serial_lo = wacom_wac->serial[0] & 0xFFFFFFFFu; ++ __u32 serial_hi = wacom_wac->serial[0] >> 32; ++ input_event(input, EV_MSC, MSC_SERIAL, (int)(serial_lo ? serial_lo : serial_hi)); + input_report_abs(input, ABS_MISC, sense ? id : 0); + } + diff --git a/queue-5.4/mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch b/queue-5.4/mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch new file mode 100644 index 00000000000..5185c2342ee --- /dev/null +++ b/queue-5.4/mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch @@ -0,0 +1,46 @@ +From 9319b647902cbd5cc884ac08a8a6d54ce111fc78 Mon Sep 17 00:00:00 2001 +From: Zach O'Keefe +Date: Thu, 18 Jan 2024 10:19:53 -0800 +Subject: mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again + +From: Zach O'Keefe + +commit 9319b647902cbd5cc884ac08a8a6d54ce111fc78 upstream. + +(struct dirty_throttle_control *)->thresh is an unsigned long, but is +passed as the u32 divisor argument to div_u64(). On architectures where +unsigned long is 64 bytes, the argument will be implicitly truncated. + +Use div64_u64() instead of div_u64() so that the value used in the "is +this a safe division" check is the same as the divisor. + +Also, remove redundant cast of the numerator to u64, as that should happen +implicitly. + +This would be difficult to exploit in memcg domain, given the ratio-based +arithmetic domain_drity_limits() uses, but is much easier in global +writeback domain with a BDI_CAP_STRICTLIMIT-backing device, using e.g. +vm.dirty_bytes=(1<<32)*PAGE_SIZE so that dtc->thresh == (1<<32) + +Link: https://lkml.kernel.org/r/20240118181954.1415197-1-zokeefe@google.com +Fixes: f6789593d5ce ("mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()") +Signed-off-by: Zach O'Keefe +Cc: Maxim Patlasov +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + mm/page-writeback.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -1530,7 +1530,7 @@ static inline void wb_dirty_limits(struc + */ + dtc->wb_thresh = __wb_calc_thresh(dtc); + dtc->wb_bg_thresh = dtc->thresh ? +- div_u64((u64)dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0; ++ div64_u64(dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0; + + /* + * In order to avoid the stacked BDI deadlock we need diff --git a/queue-5.4/series b/queue-5.4/series index edacf52767e..12dbe4e3c4d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -210,3 +210,9 @@ spi-ppc4xx-drop-write-only-variable.patch asoc-rt5645-fix-deadlock-in-rt5645_jack_detect_work.patch mips-add-memory-clobber-to-csum_ipv6_magic-inline-as.patch i40e-fix-waiting-for-queues-of-all-vsis-to-be-disabl.patch +tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch +mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch +hid-wacom-generic-avoid-reporting-a-serial-of-0-to-userspace.patch +hid-wacom-do-not-register-input-devices-until-after-hid_hw_start.patch +usb-hub-check-for-alternate-port-before-enabling-a_alt_hnp_support.patch +usb-f_mass_storage-forbid-async-queue-when-shutdown-happen.patch diff --git a/queue-5.4/tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch b/queue-5.4/tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch new file mode 100644 index 00000000000..c57759d8358 --- /dev/null +++ b/queue-5.4/tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch @@ -0,0 +1,40 @@ +From 0958b33ef5a04ed91f61cef4760ac412080c4e08 Mon Sep 17 00:00:00 2001 +From: "Masami Hiramatsu (Google)" +Date: Fri, 26 Jan 2024 09:42:58 +0900 +Subject: tracing/trigger: Fix to return error if failed to alloc snapshot + +From: Masami Hiramatsu (Google) + +commit 0958b33ef5a04ed91f61cef4760ac412080c4e08 upstream. + +Fix register_snapshot_trigger() to return error code if it failed to +allocate a snapshot instead of 0 (success). Unless that, it will register +snapshot trigger without an error. + +Link: https://lore.kernel.org/linux-trace-kernel/170622977792.270660.2789298642759362200.stgit@devnote2 + +Fixes: 0bbe7f719985 ("tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation") +Cc: stable@vger.kernel.org +Cc: Vincent Donnefort +Signed-off-by: Masami Hiramatsu (Google) +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + kernel/trace/trace_events_trigger.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/kernel/trace/trace_events_trigger.c ++++ b/kernel/trace/trace_events_trigger.c +@@ -1140,8 +1140,10 @@ register_snapshot_trigger(char *glob, st + struct event_trigger_data *data, + struct trace_event_file *file) + { +- if (tracing_alloc_snapshot_instance(file->tr) != 0) +- return 0; ++ int ret = tracing_alloc_snapshot_instance(file->tr); ++ ++ if (ret < 0) ++ return ret; + + return register_trigger(glob, ops, data, file); + } diff --git a/queue-5.4/usb-f_mass_storage-forbid-async-queue-when-shutdown-happen.patch b/queue-5.4/usb-f_mass_storage-forbid-async-queue-when-shutdown-happen.patch new file mode 100644 index 00000000000..7a39c95a32b --- /dev/null +++ b/queue-5.4/usb-f_mass_storage-forbid-async-queue-when-shutdown-happen.patch @@ -0,0 +1,71 @@ +From b2d2d7ea0dd09802cf5a0545bf54d8ad8987d20c Mon Sep 17 00:00:00 2001 +From: yuan linyu +Date: Tue, 23 Jan 2024 11:48:29 +0800 +Subject: usb: f_mass_storage: forbid async queue when shutdown happen + +From: yuan linyu + +commit b2d2d7ea0dd09802cf5a0545bf54d8ad8987d20c upstream. + +When write UDC to empty and unbind gadget driver from gadget device, it is +possible that there are many queue failures for mass storage function. + +The root cause is mass storage main thread alaways try to queue request to +receive a command from host if running flag is on, on platform like dwc3, +if pull down called, it will not queue request again and return +-ESHUTDOWN, but it not affect running flag of mass storage function. + +Check return code from mass storage function and clear running flag if it +is -ESHUTDOWN, also indicate start in/out transfer failure to break loops. + +Cc: stable +Signed-off-by: yuan linyu +Reviewed-by: Alan Stern +Link: https://lore.kernel.org/r/20240123034829.3848409-1-yuanlinyu@hihonor.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/gadget/function/f_mass_storage.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +--- a/drivers/usb/gadget/function/f_mass_storage.c ++++ b/drivers/usb/gadget/function/f_mass_storage.c +@@ -574,21 +574,37 @@ static int start_transfer(struct fsg_dev + + static bool start_in_transfer(struct fsg_common *common, struct fsg_buffhd *bh) + { ++ int rc; ++ + if (!fsg_is_set(common)) + return false; + bh->state = BUF_STATE_SENDING; +- if (start_transfer(common->fsg, common->fsg->bulk_in, bh->inreq)) ++ rc = start_transfer(common->fsg, common->fsg->bulk_in, bh->inreq); ++ if (rc) { + bh->state = BUF_STATE_EMPTY; ++ if (rc == -ESHUTDOWN) { ++ common->running = 0; ++ return false; ++ } ++ } + return true; + } + + static bool start_out_transfer(struct fsg_common *common, struct fsg_buffhd *bh) + { ++ int rc; ++ + if (!fsg_is_set(common)) + return false; + bh->state = BUF_STATE_RECEIVING; +- if (start_transfer(common->fsg, common->fsg->bulk_out, bh->outreq)) ++ rc = start_transfer(common->fsg, common->fsg->bulk_out, bh->outreq); ++ if (rc) { + bh->state = BUF_STATE_FULL; ++ if (rc == -ESHUTDOWN) { ++ common->running = 0; ++ return false; ++ } ++ } + return true; + } + diff --git a/queue-5.4/usb-hub-check-for-alternate-port-before-enabling-a_alt_hnp_support.patch b/queue-5.4/usb-hub-check-for-alternate-port-before-enabling-a_alt_hnp_support.patch new file mode 100644 index 00000000000..b5440a50e54 --- /dev/null +++ b/queue-5.4/usb-hub-check-for-alternate-port-before-enabling-a_alt_hnp_support.patch @@ -0,0 +1,79 @@ +From f17c34ffc792bbb520e4b61baa16b6cfc7d44b13 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Mon, 22 Jan 2024 16:35:32 +0100 +Subject: USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Oliver Neukum + +commit f17c34ffc792bbb520e4b61baa16b6cfc7d44b13 upstream. + +The OTG 1.3 spec has the feature A_ALT_HNP_SUPPORT, which tells +a device that it is connected to the wrong port. Some devices +refuse to operate if you enable that feature, because it indicates +to them that they ought to request to be connected to another port. + +According to the spec this feature may be used based only the following +three conditions: + +6.5.3 a_alt_hnp_support +Setting this feature indicates to the B-device that it is connected to +an A-device port that is not capable of HNP, but that the A-device does +have an alternate port that is capable of HNP. +The A-device is required to set this feature under the following conditions: +• the A-device has multiple receptacles +• the A-device port that connects to the B-device does not support HNP +• the A-device has another port that does support HNP + +A check for the third and first condition is missing. Add it. + +Signed-off-by: Oliver Neukum +Cc: stable +Fixes: 7d2d641c44269 ("usb: otg: don't set a_alt_hnp_support feature for OTG 2.0 device") +Link: https://lore.kernel.org/r/20240122153545.12284-1-oneukum@suse.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/core/hub.c | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -2365,17 +2365,25 @@ static int usb_enumerate_device_otg(stru + } + } else if (desc->bLength == sizeof + (struct usb_otg_descriptor)) { +- /* Set a_alt_hnp_support for legacy otg device */ +- err = usb_control_msg(udev, +- usb_sndctrlpipe(udev, 0), +- USB_REQ_SET_FEATURE, 0, +- USB_DEVICE_A_ALT_HNP_SUPPORT, +- 0, NULL, 0, +- USB_CTRL_SET_TIMEOUT); +- if (err < 0) +- dev_err(&udev->dev, +- "set a_alt_hnp_support failed: %d\n", +- err); ++ /* ++ * We are operating on a legacy OTP device ++ * These should be told that they are operating ++ * on the wrong port if we have another port that does ++ * support HNP ++ */ ++ if (bus->otg_port != 0) { ++ /* Set a_alt_hnp_support for legacy otg device */ ++ err = usb_control_msg(udev, ++ usb_sndctrlpipe(udev, 0), ++ USB_REQ_SET_FEATURE, 0, ++ USB_DEVICE_A_ALT_HNP_SUPPORT, ++ 0, NULL, 0, ++ USB_CTRL_SET_TIMEOUT); ++ if (err < 0) ++ dev_err(&udev->dev, ++ "set a_alt_hnp_support failed: %d\n", ++ err); ++ } + } + } + #endif