From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793796830; b=LaXEmg5GMyZa5w9MaulzH85k+XxzsNvRPdP6ZeVKbJfvDgg9R2kX3soTBsi+iXrI07Vq waBVIxRcRqoQ/GBvjZOWQmnF6PzPI9ucKuO1wWt4vyKssxdGO8u5zRxlRB7q98SK+OKuz yZcPjLPEcmw54E5Z+vWBBQMdt2ZBifj3uR1PXkZTpFiSHbXVFKkWI2kl0KvHQHyUll9Zo gi4BD3FyrEIug4nkVjp0K47TE1YR5Eg87Rjy4y7HIJX4igEgbfUlqpmQPzJXKf1k37iQw nPM3lClNGGzp/fGdEP2ox77ATZdLBteeyZkHAQ6cCjTIK2cesJHUtlN1mYCZswQmXyg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793796830; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:MIME-Version:Content-Transfer-Encoding; bh=dQeDBQaYC+1E6SoUX0OhszHMVcEGeNK258dKX42ECfg=; b=iqGSDQ1B3NBwW6YuGT2YWNXjTPHJShd8t7zDxzw/c1xmSaXYtPDOQ0ZS2LcOZwx8Q5AR oUVI0pdtfiRiiY/mvLWFmlBe0iiQikN+mTA5pSfIy9kSIpsPqWkkODfl7h4QilDbset7L dlH7FDetKhSq8YhlxAOF1mjob9eHR6i99n2ctkQMgRwlnlFdy9Ongy16/izyPjrbsdVjW xH2SBlzCd8a2m6WnDXwuKeqze3/mX/YJY9QYMxvbFI4vu70ugiiIKZJjJDM0XoIBDvIw8 K4pDfwcF8C17wiBo7oe2EXhnKsZCbfmJCGxH7Z+9CKNWyliHoNqlMhBCHFbOqdkBvTA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ktj6KEmh; arc=none smtp.remote-ip=209.85.128.49 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1444A606A31B for ; Wed, 4 Nov 2026 12:53:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1444A606A31B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ktj6KEmh Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4a2072b9832so10587505e9.1 for ; Wed, 04 Nov 2026 04:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793796828; x=1794401628; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=dQeDBQaYC+1E6SoUX0OhszHMVcEGeNK258dKX42ECfg=; b=ktj6KEmhxJq+o87tNkdrmYXGC9amk6JOz3ljdSX1WzIhRfgngzc37yG2WgN/Ja+mma sjb1Pj1VVgDIGAeU3jVjDpSy2c+UCJAwaOw5lRAeTZfciJVMWumqKs5hMBzailPuw/IN 1/vwZDsVHMqaWyKkyH3MpLwxjuaTCIAVqaBNX8ao7C3EOX6+Vl7IbEUzUwIW19XNRXHx aFIE6zaYgiS0GijcvL7f5PDV4DRRT09SeIjMz+o/gt787si5s1hRlFOX0Q+3ypcDN6DG SYDZKInFvulyn+Je5vEd87dGziD/MagyvXSAJCjeuISUu4sA3A7Ws7dUukXg1wmz78/6 7psQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793796828; x=1794401628; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dQeDBQaYC+1E6SoUX0OhszHMVcEGeNK258dKX42ECfg=; b=AxXyj8AwP16INiHcfcPdwrQlLE6DR66Wx3o332cfJrHyNGrR+YdW5+MVa4PAlkf+SY nmdFr3XuR0+EZ2ySME8Z+W2FPYVc4+5ZSMPMxEmGxgPYIebuouK3C46rgD/25aYY+LbI JphY9KbTMxHP8hipBiGsHWOwq9uftXzSlgxjEa9f8e+C3FeR5HfBBwKcozy4wRwRe6WY T4lBZxtJFPZjhzXxvtqhFV37JcnT4VapaQHolGXn+SkivX8eFn+bWcJygoop1kKoWFLE qiRvUI+uiMJewBQq9Jpn+XA2LjtKgpnCvaC9reBMLdYm1zKmxHAS0KNBkWOnBpJMdyk7 Bp2A== X-Gm-Message-State: APuU4Z9u9a92Is+mkL/4l+/i7vr9LFLw6FsVG2BCuquJnRoMS5wFr7k8 DKD46mq+55+gcXIcnt1gOFKEv40gOBVob0UI/psRH/3zQpEiTf1a9Ac= X-Gm-Gg: AYBFou2yqjbEBNDL580wNgrbECIdX4Bd9wHnxjwXG3pNkVtcKCaOQsGPbWrGku63ip9 gTvDUJxzRzLXNP6sqyicuwLs7OOQ4omoVfKHew+C792gqm7nykuMkH3H1xR84bijumgHGPxwZy0 VNHG+ykQVcqrSi35jqO+IH/fqAEx7FXkOomVgS6iGrZ2NwXXIUi3I35rF+8Ft9JBViFtrasI/Km RDNhpUyOKOTk4G1F9G+43koVKKi+fXSa4d7BzB4q5+Jkgd4OB6Is6YddKGow8VPPpQEUzajZmPJ EEddhOgwUwo/oXYkO2TKIzRaZwLDBt5RorzGLGPGOz15Bh0iOVMHp2wgLxDfCnaDzHC+lV0P47+ 4qZJ0s0vmiKRX5N1lvV/NQNmnVZYjhoa4VeKQvSNEy8y7qtcZ8e0Hw98BnJHoyW63+Ie8/g2DQD ktHs14JDAhXj7/7hXPiFH18N/h9TgsW/MiZAf36jbiC8N2HbL8mYMabB1FxBYYuSnKNY4BjyQ5s EfJh4JksFKNp/x9zmezTAy+xL7rTM/WYXg8hc2K6n1uta2+1WURjwlYlMKgOmyhVjP7mI4Wdw== X-Received: by 2002:a7b:c051:0:b0:4a1:d766:758 with SMTP id 5b1f17b1804b1-4aa8b0609cfmr358227225e9.16.1793796828290; Wed, 04 Nov 2026 04:53:48 -0800 (PST) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48fec8d8748sm3810754f8f.16.2026.11.04.04.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 04:53:47 -0800 (PST) From: Tristan Madani To: Neill Kapron , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani , stable@vger.kernel.org Subject: [PATCH v4] usb: gadget: f_uac1_legacy: fix copy_buf lifetime on queue handoff and free Date: Wed, 4 Nov 2026 12:53:46 +0000 Message-ID: <20261104125346.2552742-1-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tristan Madani f_audio_free() tears down the f_audio structure without cancelling playback_work or releasing audio buffers. The pending work can access the freed structure, and queued audio buffers leak. Additionally, f_audio_set_alt() and f_audio_out_ep_complete() transfer copy_buf to play_queue without clearing audio->copy_buf. When playback_work later consumes the buffer from the queue, audio->copy_buf becomes a stale reference. Clear audio->copy_buf when its buffer is queued to play_queue, so the pointer reliably reflects ownership. In f_audio_free(), cancel playback_work, drain the play_queue, and free copy_buf when it was not queued. Use IS_ERR_OR_NULL for the copy_buf check because f_audio_buffer_alloc() returns ERR_PTR on failure and f_audio_set_alt() stores the result directly in audio->copy_buf. Fixes: c6994e6f067c ("USB: gadget: add USB Audio Gadget driver") Cc: stable@vger.kernel.org Signed-off-by: Tristan Madani --- Changes in v4: - Fix the root cause of the stale copy_buf reference: clear audio->copy_buf at the two sites that transfer ownership to play_queue (f_audio_out_ep_complete inside the spinlock, and f_audio_set_alt alt 0) so playback_work consuming the buffer can no longer leave a stale pointer (sashiko-bot) - Simplify f_audio_free drain: no buf == copy_buf comparison needed since copy_buf is now reliably NULL when its buffer is on the queue Changes in v3: - Guard copy_buf free with IS_ERR_OR_NULL because f_audio_buffer_alloc() returns ERR_PTR on failure (sashiko-bot) - Attempted to detect copy_buf during queue drain, but that missed the case where playback_work already consumed it Changes in v2: - Added play_queue drain and copy_buf free (sashiko-bot) drivers/usb/gadget/function/f_uac1_legacy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c index 7c8d60c7e87d1..cba7b447b09e3 100644 --- a/drivers/usb/gadget/function/f_uac1_legacy.c +++ b/drivers/usb/gadget/function/f_uac1_legacy.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -338,6 +339,7 @@ static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req) if (audio_buf_size - copy_buf->actual < req->actual) { spin_lock_irq(&audio->lock); list_add_tail(©_buf->list, &audio->play_queue); + audio->copy_buf = NULL; spin_unlock_irq(&audio->lock); schedule_work(&audio->playback_work); copy_buf = f_audio_buffer_alloc(audio_buf_size); @@ -670,6 +672,7 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt) if (copy_buf) { list_add_tail(©_buf->list, &audio->play_queue); + audio->copy_buf = NULL; schedule_work(&audio->playback_work); } } @@ -942,7 +945,15 @@ static void f_audio_free(struct usb_function *f) { struct f_audio *audio = func_to_audio(f); struct f_uac1_legacy_opts *opts; + struct f_audio_buf *buf, *tmp; + cancel_work_sync(&audio->playback_work); + list_for_each_entry_safe(buf, tmp, &audio->play_queue, list) { + list_del(&buf->list); + f_audio_buffer_free(buf); + } + if (!IS_ERR_OR_NULL(audio->copy_buf)) + f_audio_buffer_free(audio->copy_buf); gaudio_cleanup(&audio->card); opts = container_of(f->fi, struct f_uac1_legacy_opts, func_inst); kfree(audio); -- 2.47.3