mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc
This fixes faulty outbount packets in case the inbound packets received from the hardware are fragmented and contain bogus input iso frames. The bug has been there for ages, but for some strange reasons, it was only triggered by newer machines in 64bit mode. Signed-off-by: Daniel Mack <zonque@gmail.com> Reported-and-tested-by: William Light <wrl@illest.net> Reported-by: Pedro Ribeiro <pedrib@gmail.com> Cc: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
a5a3973da8
commit
15439bde3a
1 changed files with 4 additions and 2 deletions
|
@ -614,6 +614,7 @@ static void read_completed(struct urb *urb)
|
|||
struct snd_usb_caiaqdev *dev;
|
||||
struct urb *out;
|
||||
int frame, len, send_it = 0, outframe = 0;
|
||||
size_t offset = 0;
|
||||
|
||||
if (urb->status || !info)
|
||||
return;
|
||||
|
@ -634,7 +635,8 @@ static void read_completed(struct urb *urb)
|
|||
len = urb->iso_frame_desc[outframe].actual_length;
|
||||
out->iso_frame_desc[outframe].length = len;
|
||||
out->iso_frame_desc[outframe].actual_length = 0;
|
||||
out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame;
|
||||
out->iso_frame_desc[outframe].offset = offset;
|
||||
offset += len;
|
||||
|
||||
if (len > 0) {
|
||||
spin_lock(&dev->spinlock);
|
||||
|
@ -650,7 +652,7 @@ static void read_completed(struct urb *urb)
|
|||
}
|
||||
|
||||
if (send_it) {
|
||||
out->number_of_packets = FRAMES_PER_URB;
|
||||
out->number_of_packets = outframe;
|
||||
out->transfer_flags = URB_ISO_ASAP;
|
||||
usb_submit_urb(out, GFP_ATOMIC);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue