From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 6 Sep 2022 18:30:52 +0000 (+0100)
Subject: usbnet: Detect short packets as sent by the xHCI controller
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2423ee233872d07c7607ce26f9225c64b30b0dc3;p=qemu.git

usbnet: Detect short packets as sent by the xHCI controller

The xHCI controller will ignore the endpoint MTU and so may deliver
packets of any length.  Detect short packets as being any packet that
has a length of zero or a length that is not a multiple of the MTU.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
Message-Id: <20220906183053.3625472-4-mcb30@ipxe.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 155df935cd..9d83974ec9 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -1211,7 +1211,7 @@ static void usb_net_handle_dataout(USBNetState *s, USBPacket *p)
     s->out_ptr += sz;
 
     if (!is_rndis(s)) {
-        if (p->iov.size < 64) {
+        if (p->iov.size % 64 || p->iov.size == 0) {
             qemu_send_packet(qemu_get_queue(s->nic), s->out_buf, s->out_ptr);
             s->out_ptr = 0;
         }