提交 15439bde 编写于 作者: D Daniel Mack 提交者: Takashi Iwai

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: NDaniel Mack <zonque@gmail.com>
Reported-and-tested-by: NWilliam Light <wrl@illest.net>
Reported-by: NPedro Ribeiro <pedrib@gmail.com>
Cc: stable@kernel.org
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 a5a3973d
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册