ALSA: line6: Reject capture buffers smaller than two packets
Subsystems (2)
PATCH v2 1/1 ALSA: line6: Reject capture buffers smaller than two packets
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.
---
v2: constrain the buffer at open instead of clamping in the copy. v1 clamped the frame count to buffer_size, which left the ring position unchanged on every oversized packet and stalled the stream, as the Sashiko review of the line6 patch pointed out. A buffer of exactly one packet has the same effect, so the bound is two packets. The clamp is replaced by a drop guard for the case the constraint makes unreachable.
sound/usb/line6/capture.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
sound/usb/line6/capture.c +29 -0
@@ -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,
@@ -224,6 +236,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;
Signature · 1 line
2.56.0
Quoted 25 lines · Sinan Turunc
line6_capture_copy()splits the copy into the ALSA ring buffer once at the buffer end and wrapspos_doneonce, which is only correct when one packet holds at mostbuffer_sizeframes. The packet size comes from the device's endpoint, and the per-device hw structs allow 64-byte periods withperiods_min1, 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_BYTESinsnd_line6_capture_open()to at least twice the larger of the two endpoints' packet sizes. Two rather than one, becausepos_doneadvances by the packet and wraps once, so a buffer of exactly one packet leaves the position unchanged after every packet.hw_paramsthen rejects a buffer that cannot hold two packets, and the single wrap is valid for every configuration that gets through. Keep a guard inline6_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.
Quoted 3 lines
Fixes 705ececd1c60 ("Staging: add line6 usb driver")Signed-off-by Sinan Turunc <[email protected]>
Applied now. Thanks.
Takashi