From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjpAX-000176-Ve for qemu-devel@nongnu.org; Mon, 12 May 2014 08:17:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjpAR-0004nk-QN for qemu-devel@nongnu.org; Mon, 12 May 2014 08:17:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjpAR-0004nc-IS for qemu-devel@nongnu.org; Mon, 12 May 2014 08:17:15 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4CCHE7h012193 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 May 2014 08:17:15 -0400 Date: Mon, 12 May 2014 15:16:07 +0300 From: "Michael S. Tsirkin" Message-ID: <1399896829-16617-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] usb: fix up post load checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , dgilbert@redhat.com Correct post load checks: 1. dev->setup_len == sizeof(dev->data_buf) seems fine, no need to fail migration 2. When state is DATA, passing index > len will cause memcpy with negative length, resulting in heap overflow First of the issues was reported by dgilbert. Reported-by: "Dr. David Alan Gilbert" Signed-off-by: Michael S. Tsirkin --- hw/usb/bus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index e48b19f..2721719 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -51,8 +51,9 @@ static int usb_device_post_load(void *opaque, int version_id) } if (dev->setup_index < 0 || dev->setup_len < 0 || - dev->setup_index >= sizeof(dev->data_buf) || - dev->setup_len >= sizeof(dev->data_buf)) { + (dev->setup_state == SETUP_STATE_DATA && + dev->setup_index > dev->setup_len) || + dev->setup_len > sizeof(dev->data_buf)) { return -EINVAL; } return 0; -- MST