From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794591242; b=t+GJRPwIFkw6/ffNC3BGilaqBee8g+IFQLsLmDKp3CD9ucqNVEx47sO9W27v50Nn2iOh vFcz7n4Dui3T7vAS9O5J+KPSAlBzVti7BE+GmuMq4NSpZQIuZPCzl1KQXwdaAzluvY4Nr Yi/WS/CdRSR2WI5kEO+3FzwPRMU8Ao/itwwZsRcJBBVDxd1hJQnKtrRS+C6gA/jtGK1ag dr0He2dPQsJCJiIYJcTKklHg3/sjkQSgE0Fw6zRksbSkjQZ8BxICVbsZsJzqgAoQLS1hb aID5XCQv83kQDQjT05RG1+b5gPaPeKzmSmUTQT2L9bd13fIJGzYbKU+7kPoF+5ZAhTQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794591242; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=3viTS/hjYhKJxvXH95ynRh4tKvFLgNtXHEb8VyqvRMU=; b=nGkUzeQlXMaMa3W9sQ+cqTPwkFn3SbwYF0VqTfBCjU7RZozWAdE7ge5oC31V2+s8lZl/ sz4t3MP8/gQ3xjwoiBsfhUEecc754OVwCFexzCmyY1cFrPOBVdAeqmO7fH3ZKEC/3h8Sj qjocgwxrhGXlQDaBfTxWAe8hZmlRqt9L0d3DlOtXsPuRvxBo2P/RMyyzdpOf9rZHS9EPl 8O7BkRLrr+wu4g/zVLzoNM7yzArBZqqf5p3Mjs1pmINeHkZ4cmsytRm82ezWUlon7IpUk 2OTTZqsKA5TM5bGQv0wZYEM5+o9mZvxJp2fdVBII1Yf4JllsyRar3R0UsV8+ob6iAkg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=SNghgGTU; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DEC860A2624; Fri, 13 Nov 2026 17:34:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=SNghgGTU Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD04F1F000C4; Fri, 13 Nov 2026 17:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794591241; bh=3viTS/hjYhKJxvXH95ynRh4tKvFLgNtXHEb8VyqvRMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SNghgGTULaOBXCrdT3+WNOeXD1BZuSNQIIMh5zcaFKqO6E7pZBj1Qdsjk4dOlqe5j RamxpY9u4KC653DuLX/6/h6L0QjXke+zaeYMas64HEg34SS6aR+QYfyVbbQEjQhSDK lS2NlbImPuLqTK+VCX2bzVNJi7okpbPc08jzL8j0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sinan Turunc , Takashi Iwai , Sasha Levin Subject: [PATCH 6.12 368/670] ALSA: line6: Reject capture buffers smaller than two packets Date: Fri, 13 Nov 2026 10:48:52 -0500 Message-ID: <20261113153824.273051068@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153811.177190860@linuxfoundation.org> References: <20261113153811.177190860@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sinan Turunc [ Upstream commit db51425c9eb038a8e40e09b837afde015ae9e3ec ] line6_capture_copy() splits the copy into the ALSA ring buffer once at the buffer end and wraps pos_done once, which is only correct when one packet holds at most buffer_size frames. The packet size comes from the device's endpoint, and the per-device hw structs allow 64-byte periods with periods_min 1, so a packet can be larger than the whole buffer. audio_in_callback() logs an oversized packet and then copies it anyway. The packet size is known at probe time, so constrain SNDRV_PCM_HW_PARAM_BUFFER_BYTES in snd_line6_capture_open() to at least twice the larger of the two endpoints' packet sizes. Two rather than one, because pos_done advances by the packet and wraps once, so a buffer of exactly one packet leaves the position unchanged after every packet. hw_params then rejects a buffer that cannot hold two packets, and the single wrap is valid for every configuration that gets through. Keep a guard in line6_capture_copy() that drops an oversized packet with a ratelimited error, for the case that should no longer be reachable. Reproduced on 7.3-rc7 with a USB/IP device presenting the GuitarPort interface layout and 1024-byte packets into a 128-byte buffer: ALSA logged "invalid position: pos = 224, buffer size = 32" and the driver logged "driver bug: len" on every following packet. With this patch a 1024-byte buffer is refused at hw_params, and a 2048-byte buffer streams for 30 s with no report and with the position moving inside the buffer. Fixes: 705ececd1c60 ("Staging: add line6 usb driver") Cc: stable@vger.kernel.org Signed-off-by: Sinan Turunc Link: https://patch.msgid.link/20261103132227.696-1-enscrpt@pm.me Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/line6/capture.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 84a9b7b76f43c..2ce020939bd72 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c @@ -94,6 +94,18 @@ void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize) if (runtime == NULL) return; + /* + * snd_line6_capture_open() constrains the buffer to hold at least + * two packets, so this cannot happen for a conforming device. Drop + * the packet rather than overrun the single wrap below. + */ + if (unlikely(frames > runtime->buffer_size)) { + dev_err_ratelimited(line6pcm->line6->ifcdev, + "packet of %d frames exceeds %lu-frame buffer, dropping\n", + frames, runtime->buffer_size); + return; + } + if (line6pcm->in.pos_done + frames > runtime->buffer_size) { /* The transferred area goes over buffer boundary, @@ -228,6 +240,23 @@ static int snd_line6_capture_open(struct snd_pcm_substream *substream) if (err < 0) return err; + /* + * line6_capture_copy() wraps the ring buffer once per packet and + * advances pos_done by the packet, which only works when the buffer + * holds more than one packet: with exactly one, pos_done gains a + * buffer and loses it again on every packet. The packet size comes + * from the device, so bound the buffer by two packets here. The + * impulse-response path copies a playback URB into this ring, so + * take the larger of the two endpoints. + */ + err = snd_pcm_hw_constraint_minmax(runtime, + SNDRV_PCM_HW_PARAM_BUFFER_BYTES, + 2 * max(line6pcm->max_packet_size_in, + line6pcm->max_packet_size_out), + UINT_MAX); + if (err < 0) + return err; + line6_pcm_acquire(line6pcm, LINE6_STREAM_CAPTURE_HELPER, false); runtime->hw = line6pcm->properties->capture_hw; -- 2.53.0