From: Greg Kroah-Hartman Date: Tue, 17 Oct 2017 14:15:54 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v3.18.76~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=323012124c121e9c2f5e4710df223b848d58aa76;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: revert-usb-gadget-inode.c-fix-unbalanced-spin_lock-in-ep0_write.patch --- diff --git a/queue-3.18/revert-usb-gadget-inode.c-fix-unbalanced-spin_lock-in-ep0_write.patch b/queue-3.18/revert-usb-gadget-inode.c-fix-unbalanced-spin_lock-in-ep0_write.patch new file mode 100644 index 00000000000..eb99ba6c57b --- /dev/null +++ b/queue-3.18/revert-usb-gadget-inode.c-fix-unbalanced-spin_lock-in-ep0_write.patch @@ -0,0 +1,36 @@ +From d88bb4defd4846ab3cdac1567aa3ab23997305cd Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 17 Oct 2017 16:12:49 +0200 +Subject: Revert "usb: gadget: inode.c: fix unbalanced spin_lock in ep0_write" + +From: Greg Kroah-Hartman + +This reverts commit abb540b5397674243994c5327146b6fed7339b71 which is +commit b7bd98b7db9f upstream. I had added it to make another patch +apply cleanly, but as Ben points out, that was wrong. + +Reported-by: Ben Hutchings +Reported-by: kbuild test robot +Cc: David Eccher +Cc: Felipe Balbi +Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org + +--- + drivers/usb/gadget/legacy/inode.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/usb/gadget/legacy/inode.c ++++ b/drivers/usb/gadget/legacy/inode.c +@@ -1231,10 +1231,11 @@ ep0_write (struct file *fd, const char _ + dev->gadget->ep0, dev->req, + GFP_KERNEL); + } +- spin_lock_irq(&dev->lock); + --dev->udc_usage; + if (retval < 0) { ++ spin_lock_irq (&dev->lock); + clean_req (dev->gadget->ep0, dev->req); ++ spin_unlock_irq (&dev->lock); + } else + retval = len; + diff --git a/queue-3.18/series b/queue-3.18/series index 9a2699de699..81a5d380077 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -17,3 +17,4 @@ usb-serial-option-add-support-for-tp-link-lte-module.patch usb-serial-qcserial-add-dell-dw5818-dw5819.patch usb-serial-console-fix-use-after-free-after-failed-setup.patch alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch +revert-usb-gadget-inode.c-fix-unbalanced-spin_lock-in-ep0_write.patch