Re: [Qemu-devel] [PATCH] usb-audio: ignore usb packages with wrong size

[Philippe Mathieu-Daudé]

On 12/11/18 8:26 AM, Gerd Hoffmann wrote:
> usb packets with no payload (zero length) seem to happen in practice for
> whatever reason.  Add a check and skip the packet then, otherwise we'll
> trigger an assert.
> 
> Reported-by: Leonardo Soares Müller 
> Signed-off-by: Gerd Hoffmann 

Reviewed-by: Philippe Mathieu-Daudé 

> ---
>  hw/usb/dev-audio.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
> index ee43e4914d..28ac7c5165 100644
> --- a/hw/usb/dev-audio.c
> +++ b/hw/usb/dev-audio.c
> @@ -321,6 +321,9 @@ static int streambuf_put(struct streambuf *buf, USBPacket 
> *p)
>  if (!free) {
>  return 0;
>  }
> +if (p->iov.size != USBAUDIO_PACKET_SIZE) {
> +return 0;
> +}
>  assert(free >= USBAUDIO_PACKET_SIZE);
>  usb_packet_copy(p, buf->data + (buf->prod % buf->size),
>  USBAUDIO_PACKET_SIZE);
> 

[Qemu-devel] [PATCH] usb-audio: ignore usb packages with wrong size

[Gerd Hoffmann]

usb packets with no payload (zero length) seem to happen in practice for
whatever reason.  Add a check and skip the packet then, otherwise we'll
trigger an assert.

Reported-by: Leonardo Soares Müller 
Signed-off-by: Gerd Hoffmann 
---
 hw/usb/dev-audio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index ee43e4914d..28ac7c5165 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -321,6 +321,9 @@ static int streambuf_put(struct streambuf *buf, USBPacket 
*p)
 if (!free) {
 return 0;
 }
+if (p->iov.size != USBAUDIO_PACKET_SIZE) {
+return 0;
+}
 assert(free >= USBAUDIO_PACKET_SIZE);
 usb_packet_copy(p, buf->data + (buf->prod % buf->size),
 USBAUDIO_PACKET_SIZE);
-- 
2.9.3