From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhGpL-00038e-Nh for qemu-devel@nongnu.org; Mon, 05 May 2014 07:13:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhGpE-0005Kz-EE for qemu-devel@nongnu.org; Mon, 05 May 2014 07:12:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhGpE-0005KF-6Z for qemu-devel@nongnu.org; Mon, 05 May 2014 07:12:48 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s45BClVi009797 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 5 May 2014 07:12:47 -0400 From: Gerd Hoffmann Date: Mon, 5 May 2014 13:12:38 +0200 Message-Id: <1399288360-29897-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1399288360-29897-1-git-send-email-kraxel@redhat.com> References: <1399288360-29897-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 09/10] usb: mtp: fix possible buffer overflow List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Wu Reviewed-by: Stefan Hajnoczi --- hw/usb/dev-mtp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index b6eaeae..62428d8 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -998,6 +998,14 @@ static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p) cmd.argc = (le32_to_cpu(container.length) - sizeof(container)) / sizeof(uint32_t); cmd.trans = le32_to_cpu(container.trans); + if (cmd.argc > ARRAY_SIZE(cmd.argv)) { + cmd.argc = ARRAY_SIZE(cmd.argv); + } + if (p->iov.size < sizeof(container) + cmd.argc * sizeof(uint32_t)) { + trace_usb_mtp_stall(s->dev.addr, "packet too small"); + p->status = USB_RET_STALL; + return; + } usb_packet_copy(p, ¶ms, cmd.argc * sizeof(uint32_t)); for (i = 0; i < cmd.argc; i++) { cmd.argv[i] = le32_to_cpu(params[i]); -- 1.8.3.1