From 1f45733f77eb4c4e5ff02d2fbd3bf3a263d49763 Mon Sep 17 00:00:00 2001 From: Michael S. Tsirkin Date: Thu, 15 May 2014 09:52:47 -0500 Subject: [PATCH 20/20] usb: fix up post load checks RH-Author: Michael S. Tsirkin Message-id: <1400144724-16256-1-git-send-email-mst@redhat.com> Patchwork-id: 58905 O-Subject: [PATCH qemu-kvm RHEL6.6] usb: fix up post load checks Bugzilla: 1096826 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Laszlo Ersek RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Juan Quintela 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 Signed-off-by: Juan Quintela (cherry picked from commit 719ffe1f5f72b1c7ace4afe9ba2815bcb53a829e) Note: in maintainer's tree git://github.com/juanquintela/qemu.git tags/migration/20140515, pull request sent CVE-2014-3461 Bugzilla: 1096826 Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7459795 Tested: lightly on developer's box --- hw/usb-bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Jeff E. Nelson --- hw/usb-bus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 5bed692..b0cb0e8 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -37,8 +37,8 @@ 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_index > dev->setup_len || + dev->setup_len > sizeof(dev->data_buf)) { return -EINVAL; } return 0; -- 1.7.1