[Qemu-devel] [PATCH v8 1/4] qxl/update_area_io: guest_bug on invalid parameters

[Alon Levy]

Signed-off-by: Alon Levy <address@hidden>
---

Changes for patchset v7->v8:
 QXL_IO_MONITORS_CONFIG_ASYNC is defined even when spice-protocol < 0.12 (Gerd 
Hoffman)
 QXL_HAS_.. is either defined or not, same as other feature definitions (Blue 
Swirl)

 Only the third patch "qxl: add QXL_IO_MONITORS_CONFIG_ASYNC" is affected.

 hw/qxl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/qxl.c b/hw/qxl.c
index c2dd3b4..6c48eb9 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1385,6 +1385,18 @@ async_common:
         QXLCookie *cookie = NULL;
         QXLRect update = d->ram->update_area;
 
+        if (d->ram->update_surface > NUM_SURFACES) {
+            qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: invalid surface id %d\n",
+                              d->ram->update_surface);
+            return;
+        }
+        if (update.left >= update.right || update.top >= update.bottom) {
+            qxl_set_guest_bug(d,
+                    "QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n",
+                    update.left, update.top, update.right, update.bottom);
+            return;
+        }
+
         if (async == QXL_ASYNC) {
             cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,
                                     QXL_IO_UPDATE_AREA_ASYNC);
-- 
1.7.11.2