From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8B34170A13; Mon, 24 Feb 2025 14:53:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408833; cv=none; b=CscXGwc3eWldVeXbcUZGV3IpqsykTcqLuCrQItDbkQ7fXLoZdfFI1RkH8PrYbCQ6hk0JMVDdDEn6NkNKz+aM8YFeA2hw5XIiE4GqdIcicaMJsA890ACLrkN64QK41kJ2+vAc+eEwqYDio/e2GonpWTMblJc88Nk4Uf54FcS3jbE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408833; c=relaxed/simple; bh=1xGUlbHWWJy2nYWR58F/r1p05qskOi/hwM4ikPi8ndc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=utVtzb//EmBoBgdGlsPmjgE+el/h6JeDK6lfIkuZws85Of+KJ3jNc/JbPYGVF0RtxHa8P0GfQnyGxmDGsQ4eLZViolBNy/BrjVmXjKI5UmOGqdY4PwAQnztNa27Qj1+sITtKJQKkUyMMxfImxWHfC32KVj9cPCb/DqRrREwWQok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UGbhuQdh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UGbhuQdh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AB64C4CED6; Mon, 24 Feb 2025 14:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1740408832; bh=1xGUlbHWWJy2nYWR58F/r1p05qskOi/hwM4ikPi8ndc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UGbhuQdhnHhPC6RT/4nNx18/PYkvSHl4FYZGXzBrGc1/mHpWmip8AZlki87+2vypp mpvkuCKck39sR0YD5H9ZrnzyTuuB05RaXuhvcYMJ/E5rCPG58wQ/7QhSs9Cl0Dgsrr cv5aRDoeZh8xGb0wMYh+Gj/hbuem9HdPCEPNvVzw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Jill Donahue , Sasha Levin Subject: [PATCH 6.13 019/138] USB: gadget: f_midi: f_midi_complete to call queue_work Date: Mon, 24 Feb 2025 15:34:09 +0100 Message-ID: <20250224142605.221150474@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224142604.442289573@linuxfoundation.org> References: <20250224142604.442289573@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jill Donahue [ 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 Signed-off-by: Jill Donahue Link: https://lore.kernel.org/r/20250211174805.1369265-1-jdonahue@fender.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 47260d65066a8..da82598fcef8a 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -283,7 +283,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; -- 2.39.5