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 DBA2730568F; Fri, 15 May 2026 15:57:24 +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=1778860644; cv=none; b=Nmei3mEWCds1VJ++4+RMz5t/tLSBbDwykhTpgUI48Q80xo5z83T5wyp3sNxyqbieOTR5bnJASm8ZPlv2pF9XqxY6ldcSVls+bwVqb0HIgiLzFEQ8xebyU0B3V3TQ6J6uZ/+2+KxvBRPGF+WQ+VTZjQGStq8xwvwNbMOA6Vn99EQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778860644; c=relaxed/simple; bh=vukkxhmDhE5RLUjkxm/L/4UDVANDjO+N6ijUxUDBnTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d2U8JrHDast7QIzeXjrIKIEJgTe67hkoUjsYtIckmowS40vIV5S9lRWRbIGYguqULso9wr4I1PWzDxAHpy34jDPboJuGC3rbPnWLeGv2k+1Kd0u9Et6dHTYEt9ZMUHYq4qrQw/hID687bctiDeK/8cBd2r5vS0omeIadm6m0LQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C98pRh9t; 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="C98pRh9t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 712F1C2BCB0; Fri, 15 May 2026 15:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778860644; bh=vukkxhmDhE5RLUjkxm/L/4UDVANDjO+N6ijUxUDBnTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C98pRh9tefa7T42Z/HPlFW81UqkwAe/8HLarrk3eqQUYQqwwSBJi5KC/B0zVQ0OHT 6dRpZ+8ZLzfr9lbo2PQdcBAEdsZkA5JxtBqb1wr++rpfvCbcDOvwG00KOCv1LXlXrY QstgutbYjGhqlenD4TkB24o4Yyd62Y6ojesdiPI0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Takashi Iwai Subject: [PATCH 6.6 007/474] ALSA: usb-audio: Evaluate packsize caps at the right place Date: Fri, 15 May 2026 17:41:56 +0200 Message-ID: <20260515154715.216122435@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 52521e8398839105ef8eb22b3f0993f9b0d11a57 upstream. We introduced the upper bound checks of the packet sizes by the ep->maxframesize for avoiding the URB submission errors. However, the check was applied at an incorrect place in the function snd_usb_endpoint_set_params() where ep->maxframesize isn't defined yet; the value is defined at a bit later position. So this ended up with a failure at the first run while the second run works. For fixing it, move the check at the correct place, right after the calculation of ep->maxframesize in the same function. Fixes: 7fe8dec3f628 ("ALSA: usb-audio: Cap the packet size pre-calculations") Link: https://bugzilla.kernel.org/show_bug.cgi?id=221292 Cc: Link: https://patch.msgid.link/20260410143220.1676344-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/endpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1397,9 +1397,6 @@ int snd_usb_endpoint_set_params(struct s goto unlock; } - ep->packsize[0] = min(ep->packsize[0], ep->maxframesize); - ep->packsize[1] = min(ep->packsize[1], ep->maxframesize); - /* calculate the frequency in 16.16 format */ ep->freqm = ep->freqn; ep->freqshift = INT_MIN; @@ -1426,6 +1423,9 @@ int snd_usb_endpoint_set_params(struct s ep->maxframesize = ep->maxpacksize / ep->cur_frame_bytes; ep->curframesize = ep->curpacksize / ep->cur_frame_bytes; + ep->packsize[0] = min(ep->packsize[0], ep->maxframesize); + ep->packsize[1] = min(ep->packsize[1], ep->maxframesize); + err = update_clock_ref_rate(chip, ep); if (err >= 0) { ep->need_setup = false;