diff options
author | John Audia <graysky@archlinux.us> | 2021-08-12 09:28:18 -0400 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-08-14 20:25:25 +0200 |
commit | ed9341dd78dcf86828769a7244a989d2c6ac2dbc (patch) | |
tree | 370efc0c78c6552227e10e3ca599eb2b4cd48fe0 /target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch | |
parent | 02e2723ef317c65b6ddfc70144b10f9936cfc2af (diff) | |
download | upstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.tar.gz upstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.tar.bz2 upstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.zip |
kernel: bump 5.4 to 5.4.140
Removed upstreamed bcm27xx/patches-5.4:
950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch
950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch b/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch deleted file mode 100644 index 1fe685cd99..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 22198e801db7542c59098a75bdab120bcbc42652 Mon Sep 17 00:00:00 2001 -From: Phil Elwell <phil@raspberrypi.com> -Date: Wed, 30 Sep 2020 19:23:43 +0100 -Subject: [PATCH] USB: gadget: f_hid: avoid crashes and log spam - -Disconnecting and reconnecting the USB cable can lead to crashes and a -variety of kernel log spam. Try to fix or minimise both. - -See: https://github.com/raspberrypi/linux/issues/3870 - -Signed-off-by: Phil Elwell <phil@raspberrypi.com> ---- - drivers/usb/gadget/function/f_hid.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -344,6 +344,11 @@ static ssize_t f_hidg_write(struct file - - spin_lock_irqsave(&hidg->write_spinlock, flags); - -+ if (!hidg->req) { -+ spin_unlock_irqrestore(&hidg->write_spinlock, flags); -+ return -ESHUTDOWN; -+ } -+ - #define WRITE_COND (!hidg->write_pending) - try_again: - /* write queue */ -@@ -364,7 +369,13 @@ try_again: - count = min_t(unsigned, count, hidg->report_length); - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); -- status = copy_from_user(req->buf, buffer, count); -+ if (req) { -+ status = copy_from_user(req->buf, buffer, count); -+ } else { -+ ERROR(hidg->func.config->cdev, "hidg->req is NULL\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - - if (status != 0) { - ERROR(hidg->func.config->cdev, -@@ -393,6 +404,11 @@ try_again: - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); - -+ if (!hidg->in_ep->enabled) { -+ ERROR(hidg->func.config->cdev, "in_ep is disabled\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); - if (status < 0) { - ERROR(hidg->func.config->cdev, |