From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39806 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pkh86-0003u4-9a for qemu-devel@nongnu.org; Wed, 02 Feb 2011 13:08:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pkh85-0006pZ-3j for qemu-devel@nongnu.org; Wed, 02 Feb 2011 13:08:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pkh84-0006pF-Sc for qemu-devel@nongnu.org; Wed, 02 Feb 2011 13:08:33 -0500 From: Hans de Goede Date: Wed, 2 Feb 2011 19:18:41 +0100 Message-Id: <1296670721-2709-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1296670721-2709-1-git-send-email-hdegoede@redhat.com> References: <1296670721-2709-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] usb: control buffer fixes List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: spice-devel@lists.freedesktop.org, Gerd Hoffmann , Hans de Goede Windows allows control transfers to pass up to 4k of data, so raise our control buffer size to 4k. For control out transfers the usb core code copies the control request data to a buffer before calling the device's handle_control callback. Add a check for overflowing the buffer before copying the data. Signed-off-by: Hans de Goede --- hw/usb.c | 6 ++++++ hw/usb.h | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/usb.c b/hw/usb.c index 560b3e4..4379c2a 100644 --- a/hw/usb.c +++ b/hw/usb.c @@ -98,6 +98,12 @@ static int do_token_setup(USBDevice *s, USBPacket *p) s->setup_len = ret; s->setup_state = SETUP_STATE_DATA; } else { + if (s->setup_len > sizeof(s->data_buf)) { + fprintf(stderr, + "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n", + s->setup_len, sizeof(s->data_buf)); + return USB_RET_STALL; + } if (s->setup_len == 0) s->setup_state = SETUP_STATE_ACK; else diff --git a/hw/usb.h b/hw/usb.h index 412ce02..51ccc86 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -167,7 +167,7 @@ struct USBDevice { int state; uint8_t setup_buf[8]; - uint8_t data_buf[1024]; + uint8_t data_buf[4096]; int remote_wakeup; int setup_state; int setup_len; -- 1.7.3.2