From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DADBAC432C3 for ; Tue, 19 Nov 2019 05:21:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B082F2231C for ; Tue, 19 Nov 2019 05:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574140874; bh=aR3JSi+XQOy3BMnTxLp5VYFQI9dIsP/fqeH7rS2pf/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bfA4eL4UAuk6fhzj+WR+Vvm6qnGJmn2iAD1rbDTnILHfDb9JcNdvD4pAEk/0Xhrj8 OLzKOslp/8b0w1iahIZB2Ms/YAINxnqzeUTFvhZEpcL+5gJNXPS/eIdsBAxfR3vhvG vZBmlYgt2IyTT5l7I8nnkqa6XBEs22wtAEb3RQGo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727237AbfKSFVN (ORCPT ); Tue, 19 Nov 2019 00:21:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:35856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727184AbfKSFVM (ORCPT ); Tue, 19 Nov 2019 00:21:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA6992231C; Tue, 19 Nov 2019 05:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574140870; bh=aR3JSi+XQOy3BMnTxLp5VYFQI9dIsP/fqeH7rS2pf/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ClbRrBfruoGOQLf+jYliDJcWFbfVy9AtFQ0HhrX5idQq3hbAzepN7Va5dWnNEQ/x4 yaAKrr+wxnUeQjhOO5TiVO1o2mMw/lceLQywTGBHGXIpKL94XoqkXo7VdfCwnP5wzQ mc58QsD075XMcnpeK36FEjmq3Zu9U7GAJFbf5cg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Henry Lin , Takashi Iwai Subject: [PATCH 5.3 15/48] ALSA: usb-audio: not submit urb for stopped endpoint Date: Tue, 19 Nov 2019 06:19:35 +0100 Message-Id: <20191119051000.929498579@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119050946.745015350@linuxfoundation.org> References: <20191119050946.745015350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Henry Lin commit 528699317dd6dc722dccc11b68800cf945109390 upstream. While output urb's snd_complete_urb() is executing, calling prepare_outbound_urb() may cause endpoint stopped before prepare_outbound_urb() returns and result in next urb submitted to stopped endpoint. usb-audio driver cannot re-use it afterwards as the urb is still hold by usb stack. This change checks EP_FLAG_RUNNING flag after prepare_outbound_urb() again to let snd_complete_urb() know the endpoint already stopped and does not submit next urb. Below kind of error will be fixed: [ 213.153103] usb 1-2: timeout: still 1 active urbs on EP #1 [ 213.164121] usb 1-2: cannot submit urb 0, error -16: unknown error Signed-off-by: Henry Lin Cc: Link: https://lore.kernel.org/r/20191113021420.13377-1-henryl@nvidia.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/endpoint.c | 3 +++ 1 file changed, 3 insertions(+) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -388,6 +388,9 @@ static void snd_complete_urb(struct urb } prepare_outbound_urb(ep, ctx); + /* can be stopped during prepare callback */ + if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) + goto exit_clear; } else { retire_inbound_urb(ep, ctx); /* can be stopped during retire callback */