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 3C0E0C432C0 for ; Fri, 22 Nov 2019 11:24:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09AC520708 for ; Fri, 22 Nov 2019 11:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421855; bh=ImmlDRzMG4QM7y293HzEHL2Nt8F3ObbdD/6TybDalBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E7TQV2elCCrD1hNWsbyHSL9ZaNt4vg+gqRIN++i19hyZFRniNiLLTREvlsHic8KyR S8s6iWZD73jx0kp+tnOkPnMKB5ELj3SExDhnGzvhOLK2BVvdotTyXRZZGbtXq/wS39 DNVBiNM0eeBnu+5D3p6aodVKQ0xQvUPpg/qDCXAs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729257AbfKVLYN (ORCPT ); Fri, 22 Nov 2019 06:24:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:42830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728789AbfKVKje (ORCPT ); Fri, 22 Nov 2019 05:39:34 -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 556E820715; Fri, 22 Nov 2019 10:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419173; bh=ImmlDRzMG4QM7y293HzEHL2Nt8F3ObbdD/6TybDalBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cakd225a+qmawMHJxqQkWaIBU2uxmVj4Bb75MfAnaKOpJfRzR/vE1Jl4cKV+4kZd1 ryyD3EcY56mdQET5TFZCe6M4214lLBFdmkcVZSryPH2t4HwgyX7qRDMZkOmzDSYXYa 7tMji0ePcMJjrObiLbo6bn8lHU+hGC/CeEgz7DO8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Henry Lin , Takashi Iwai Subject: [PATCH 4.9 004/222] ALSA: usb-audio: not submit urb for stopped endpoint Date: Fri, 22 Nov 2019 11:25:44 +0100 Message-Id: <20191122100831.363618518@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -403,6 +403,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 */