From patchwork Thu Mar 2 16:36:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alvin_=C5=A0ipraga?= X-Patchwork-Id: 63485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:7b8e:b0:9f:8c76:fea4 with SMTP id j14csp5821447dyk; Thu, 2 Mar 2023 08:40:36 -0800 (PST) X-Google-Smtp-Source: AK7set/Zs8wjZ/yw7wYy6fTc7aOMGAigJ2zkmnX+6AZxLhxi+DCo5HD09cqNwTlDhsDoG/AP5+c7 X-Received: by 2002:a05:6a20:7da6:b0:cd:9654:d97d with SMTP id v38-20020a056a207da600b000cd9654d97dmr11641481pzj.57.1677775236309; Thu, 02 Mar 2023 08:40:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677775236; cv=none; d=google.com; s=arc-20160816; b=xvt8mSQuPTeJchVVeeesoLbZ0HwWPH+BkKDKfhCrN3kMusfRH/9Le3iWw6xJCU1VpI gymuuABST6eHTP5mjNQbKQcUcHaRyXUAvg62vaQ4+JDnvP8K0M3nigttOaHhjbtImmbF cfv2THaLpsxCfNBMdl34C6HvRO6MHRbgh6uB2JeDtIHsPvPOUV84/i8VdgXh00Sw/l50 dcDt+qt5EcOUPY+IQJSwYUoI8RWSRIetu5/YZjk+T+/DScAwDxSIseBO/wynpyqqxreB Rc6PeNuxUZQYxwflxOyRdM9GPqSp/ZoeR6z5kCoNBvyxvzjHU2lb9IGQg7AKiZrVT6l0 QxjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=tfY1Ul1QnfuQtui+4Ej95F51iCd9NVPI2d94LXtRwmo=; b=VEpFRCo+lrLAUjg05CxGGh34uT22k4gVveDTRRzfIrwaldk9jKQAz6hVrg+CV7B1rz 5amd3t+UJcb1CKLcPZiIra9eTHOfdHqKeeBVB0o3oM1yiBqdko1QTkBffwy9903mhEK3 6W45VzgSdMdM0TyzFCepkp4GFtTAaw8Cci9WhqliNSleEz8JuWnkf9nR+oxAzfrVJGCf Aopcjdr3ZzCoRpE01azFw5Qff9oTtE4CdPCvCD0RDu7vckanEMYStbZurXhks5NUihD5 kdDEvO32rMUExw4AxqX4+yG8LVzo3R/YmvS7JE7j9kx38HnwTAWsgOIn5Vwb1VvJO2EW 2QDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@pqrs.dk header.s=google header.b="bDoI/39/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t188-20020a6281c5000000b00592591f1972si7882645pfd.64.2023.03.02.08.40.01; Thu, 02 Mar 2023 08:40:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=temperror (no key for signature) header.i=@pqrs.dk header.s=google header.b="bDoI/39/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229520AbjCBQiX (ORCPT + 99 others); Thu, 2 Mar 2023 11:38:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbjCBQiU (ORCPT ); Thu, 2 Mar 2023 11:38:20 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24EEC57D3C for ; Thu, 2 Mar 2023 08:37:34 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id o15so67500998edr.13 for ; Thu, 02 Mar 2023 08:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pqrs.dk; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tfY1Ul1QnfuQtui+4Ej95F51iCd9NVPI2d94LXtRwmo=; b=bDoI/39/km5XuwmNOoWn9p3W5zwRXDGImrlqwgWO1zuWUu1uLGMwSch+pf0z7lOVEk 73JivL/5QyrKUaadxgCH/zBN/F+kuk2N5+pmDTVCqty5ou9Lp5ebIvJuY0sM6+2Ye5lX Ct4Fw8SaWySke/s2OpZJIlJv6gBiooF1l0PkA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tfY1Ul1QnfuQtui+4Ej95F51iCd9NVPI2d94LXtRwmo=; b=gw0GBwmmPA4XepNNDo2+V1DbUkzRaj9tmzyQ6Va5R05h2jiQGPSzeVEcjws39hBpqN kDqPXQSYfcJHKxrOoKhtPrlGZEw0+LhphB2Q1rj4JNnql/LckyyA8pN7RbVFT8nbD/FI 0LfrrxWlRzr/TSGyP7dQGWw6qP90XAhDc/lPjpDrRJsY8JPLVgfEZWvNUawwOU0LLOoC nQ0NwRheMfPNs34Lw/4N2APIja51LTEkdcJbjCiMxroy6cCt3muBhHJWYhVqW57CcoqU /oJmov9VNyg2solPwc1Djp8Y8SLqVzsZjhNxiY1AD0QBrYvyLEzkFqa+zY3NwA31SuD1 u8Zw== X-Gm-Message-State: AO0yUKUwTCyhs/zhKSRPiPv/KU27dXkRWZamUyKI5viQ6xpY2u4keK7b lVa3Wb2YZLORLlIF3C5RfUdh0A== X-Received: by 2002:a17:906:6543:b0:8a9:e031:c4ae with SMTP id u3-20020a170906654300b008a9e031c4aemr10818449ejn.2.1677775047510; Thu, 02 Mar 2023 08:37:27 -0800 (PST) Received: from localhost.localdomain (80.71.142.18.ipv4.parknet.dk. [80.71.142.18]) by smtp.gmail.com with ESMTPSA id os6-20020a170906af6600b008f7f6943d1dsm7173547ejb.42.2023.03.02.08.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 08:37:27 -0800 (PST) From: =?utf-8?q?Alvin_=C5=A0ipraga?= To: Jaroslav Kysela , Takashi Iwai , Greg Kroah-Hartman , Yadi Brar , Jassi Brar , Felipe Balbi Cc: alsa-devel@alsa-project.org, =?utf-8?q?Alvin_=C5=A0ipraga?= , stable@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: gadget: u_audio: don't let userspace block driver unbind Date: Thu, 2 Mar 2023 17:36:47 +0100 Message-Id: <20230302163648.3349669-1-alvin@pqrs.dk> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759274846235829029?= X-GMAIL-MSGID: =?utf-8?q?1759274846235829029?= From: Alvin Šipraga In the unbind callback for f_uac1 and f_uac2, a call to snd_card_free() via g_audio_cleanup() will disconnect the card and then wait for all resources to be released, which happens when the refcount falls to zero. Since userspace can keep the refcount incremented by not closing the relevant file descriptor, the call to unbind may block indefinitely. This can cause a deadlock during reboot, as evidenced by the following blocked task observed on my machine: task:reboot state:D stack:0 pid:2827 ppid:569 flags:0x0000000c Call trace: __switch_to+0xc8/0x140 __schedule+0x2f0/0x7c0 schedule+0x60/0xd0 schedule_timeout+0x180/0x1d4 wait_for_completion+0x78/0x180 snd_card_free+0x90/0xa0 g_audio_cleanup+0x2c/0x64 afunc_unbind+0x28/0x60 ... kernel_restart+0x4c/0xac __do_sys_reboot+0xcc/0x1ec __arm64_sys_reboot+0x28/0x30 invoke_syscall+0x4c/0x110 ... The issue can also be observed by opening the card with arecord and then stopping the process through the shell before unbinding: # arecord -D hw:UAC2Gadget -f S32_LE -c 2 -r 48000 /dev/null Recording WAVE '/dev/null' : Signed 32 bit Little Endian, Rate 48000 Hz, Stereo ^Z[1]+ Stopped arecord -D hw:UAC2Gadget -f S32_LE -c 2 -r 48000 /dev/null # echo gadget.0 > /sys/bus/gadget/drivers/configfs-gadget/unbind (observe that the unbind command never finishes) Fix the problem by using snd_card_free_when_closed() instead, which will still disconnect the card as desired, but defer the task of freeing the resources to the core once userspace closes its file descriptor. Fixes: 132fcb460839 ("usb: gadget: Add Audio Class 2.0 Driver") Cc: stable@vger.kernel.org Signed-off-by: Alvin Šipraga Reviewed-by: John Keeping Reviewed-by: Ruslan Bilovol --- drivers/usb/gadget/function/u_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index c1f62e91b012..4a42574b4a7f 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -1422,7 +1422,7 @@ void g_audio_cleanup(struct g_audio *g_audio) uac = g_audio->uac; card = uac->card; if (card) - snd_card_free(card); + snd_card_free_when_closed(card); kfree(uac->p_prm.reqs); kfree(uac->c_prm.reqs);