summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorJill Donahue <jilliandonahue58@gmail.com>2025-02-11 10:48:05 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-07 16:56:33 +0100
commit24a942610ee9bafb2692a456ae850c5b2e409b05 (patch)
tree73b6a3e1e37353380e3e11692e10c882da49625c /drivers/usb
parente3bc1a9a67ce33a2e761e6e7b7c2afc6cb9b7266 (diff)
downloadlinux-24a942610ee9bafb2692a456ae850c5b2e409b05.tar.gz
linux-24a942610ee9bafb2692a456ae850c5b2e409b05.tar.bz2
linux-24a942610ee9bafb2692a456ae850c5b2e409b05.zip
USB: gadget: f_midi: f_midi_complete to call queue_work
[ Upstream commit 4ab37fcb42832cdd3e9d5e50653285ca84d6686f ] When using USB MIDI, a lock is attempted to be acquired twice through a re-entrant call to f_midi_transmit, causing a deadlock. Fix it by using queue_work() to schedule the inner f_midi_transmit() via a high priority work queue from the completion handler. Link: https://lore.kernel.org/all/CAArt=LjxU0fUZOj06X+5tkeGT+6RbXzpWg1h4t4Fwa_KGVAX6g@mail.gmail.com/ Fixes: d5daf49b58661 ("USB: gadget: midi: add midi function driver") Cc: stable <stable@kernel.org> Signed-off-by: Jill Donahue <jilliandonahue58@gmail.com> Link: https://lore.kernel.org/r/20250211174805.1369265-1-jdonahue@fender.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/function/f_midi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 1d8521103b66..dd1cfeeffb67 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -282,7 +282,7 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
/* Our transmit completed. See if there's more to go.
* f_midi_transmit eats req, don't queue it again. */
req->length = 0;
- f_midi_transmit(midi);
+ queue_work(system_highpri_wq, &midi->work);
return;
}
break;