|
 |
eb5a2f |
From 586e92b335a98dcfbb4a797eb744753038da4374 Mon Sep 17 00:00:00 2001
|
|
|
eb5a2f |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
eb5a2f |
Date: Wed, 14 May 2014 08:26:14 +0200
|
|
|
eb5a2f |
Subject: [PATCH 14/30] usb: sanity check setup_index+setup_len in post_load
|
|
|
eb5a2f |
|
|
|
eb5a2f |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
eb5a2f |
Message-id: <1400055942-6418-1-git-send-email-mst@redhat.com>
|
|
|
eb5a2f |
Patchwork-id: 58853
|
|
|
eb5a2f |
O-Subject: [PATCH qemu-kvm RHEL7.0.z 1/2] usb: sanity check setup_index+setup_len in post_load
|
|
|
eb5a2f |
Bugzilla: 1095746
|
|
|
eb5a2f |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
eb5a2f |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
eb5a2f |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
eb5a2f |
|
|
|
eb5a2f |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
eb5a2f |
|
|
|
eb5a2f |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
eb5a2f |
(cherry picked from commit c60174e847082ab9f70720f86509a3353f816fad)
|
|
|
eb5a2f |
|
|
|
eb5a2f |
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7450401
|
|
|
eb5a2f |
Tested: lightly on developer's box
|
|
|
eb5a2f |
Bugzilla: 1095743
|
|
|
eb5a2f |
---
|
|
|
eb5a2f |
hw/usb/bus.c | 4 ++++
|
|
|
eb5a2f |
1 file changed, 4 insertions(+)
|
|
|
eb5a2f |
|
|
|
eb5a2f |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
eb5a2f |
---
|
|
|
eb5a2f |
hw/usb/bus.c | 4 ++++
|
|
|
eb5a2f |
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
eb5a2f |
|
|
|
eb5a2f |
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
|
|
|
eb5a2f |
index fe6bd13..e0c3a77 100644
|
|
|
eb5a2f |
--- a/hw/usb/bus.c
|
|
|
eb5a2f |
+++ b/hw/usb/bus.c
|
|
|
eb5a2f |
@@ -49,6 +49,10 @@ static int usb_device_post_load(void *opaque, int version_id)
|
|
|
eb5a2f |
} else {
|
|
|
eb5a2f |
dev->attached = 1;
|
|
|
eb5a2f |
}
|
|
|
eb5a2f |
+ if (dev->setup_index >= sizeof(dev->data_buf) ||
|
|
|
eb5a2f |
+ dev->setup_len >= sizeof(dev->data_buf)) {
|
|
|
eb5a2f |
+ return -EINVAL;
|
|
|
eb5a2f |
+ }
|
|
|
eb5a2f |
return 0;
|
|
|
eb5a2f |
}
|
|
|
eb5a2f |
|
|
|
eb5a2f |
--
|
|
|
eb5a2f |
1.7.1
|
|
|
eb5a2f |
|