|
 |
fa00e1e |
From 23dae2df759eed12a5a976c6c23ad2e7bb135abb Mon Sep 17 00:00:00 2001
|
|
 |
c8dfc65 |
From: Alon Levy <alevy@redhat.com>
|
|
|
c8dfc65 |
Date: Tue, 21 Aug 2012 13:51:31 +0300
|
|
|
5544c1b |
Subject: [PATCH] qxl/update_area_io: guest_bug on invalid parameters
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
|
c8dfc65 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5544c1b |
(cherry picked from commit 511b13e2c9b426b3c56060909693de5097f0b496)
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
c8dfc65 |
---
|
|
|
c8dfc65 |
hw/qxl.c | 12 ++++++++++++
|
|
|
c8dfc65 |
1 file changed, 12 insertions(+)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
|
c8dfc65 |
index 95bbc03..baf9bb4 100644
|
|
|
c8dfc65 |
--- a/hw/qxl.c
|
|
|
c8dfc65 |
+++ b/hw/qxl.c
|
|
|
c8dfc65 |
@@ -1386,6 +1386,18 @@ async_common:
|
|
|
c8dfc65 |
QXLCookie *cookie = NULL;
|
|
|
c8dfc65 |
QXLRect update = d->ram->update_area;
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
+ if (d->ram->update_surface > NUM_SURFACES) {
|
|
|
c8dfc65 |
+ qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: invalid surface id %d\n",
|
|
|
c8dfc65 |
+ d->ram->update_surface);
|
|
|
c8dfc65 |
+ return;
|
|
|
c8dfc65 |
+ }
|
|
|
c8dfc65 |
+ if (update.left >= update.right || update.top >= update.bottom) {
|
|
|
c8dfc65 |
+ qxl_set_guest_bug(d,
|
|
|
c8dfc65 |
+ "QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n",
|
|
|
c8dfc65 |
+ update.left, update.top, update.right, update.bottom);
|
|
|
c8dfc65 |
+ return;
|
|
|
c8dfc65 |
+ }
|
|
|
c8dfc65 |
+
|
|
|
c8dfc65 |
if (async == QXL_ASYNC) {
|
|
|
c8dfc65 |
cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,
|
|
|
c8dfc65 |
QXL_IO_UPDATE_AREA_ASYNC);
|