From patchwork Mon Feb 8 14:19:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Brown X-Patchwork-Id: 8250071 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 042A3BEEE5 for ; Mon, 8 Feb 2016 14:20:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 695E920265 for ; Mon, 8 Feb 2016 14:20:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C01772025A for ; Mon, 8 Feb 2016 14:20:11 +0000 (UTC) Received: from localhost ([::1]:45196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmfj-0002yT-2w for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Feb 2016 09:20:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmfQ-0002ro-IN for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSmfM-00061p-Qj for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:52 -0500 Received: from duck.fensystems.co.uk ([2001:ba8:0:1d4::6950:5845]:49678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmfM-00061Q-K0 for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:48 -0500 Received: from localhost.localdomain (genkt-056-205.t-mobile.co.uk [149.254.56.205]) by duck.fensystems.co.uk (Postfix) with ESMTPSA id 2799C107A2; Mon, 8 Feb 2016 14:19:47 +0000 (GMT) From: Michael Brown To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2016 14:19:33 +0000 Message-Id: <1454941174-25050-4-git-send-email-mcb30@ipxe.org> X-Mailer: git-send-email 2.3.8 In-Reply-To: <1454941174-25050-1-git-send-email-mcb30@ipxe.org> References: <1454941174-25050-1-git-send-email-mcb30@ipxe.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:ba8:0:1d4::6950:5845 Cc: Michael Brown Subject: [Qemu-devel] [PATCH 3/4] usbnet: Detect short packets as sent by the xHCI controller X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- hw/usb/dev-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index f4e7acb..09312d4 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1206,7 +1206,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; }