Patchwork qxl/update_area_io: guest_bug on invalid parameters

login
register
mail settings
Submitter Alon Levy
Date July 29, 2012, 9:55 a.m.
Message ID <1343555755-4122-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/173911/
State New
Headers show

Comments

Alon Levy - July 29, 2012, 9:55 a.m.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
 hw/qxl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
Hans de Goede - July 30, 2012, 10:18 a.m.
Acked-by: Hans de Goede <hdegoede@redhat.com>

On 07/29/2012 11:55 AM, Alon Levy wrote:
> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
>   hw/qxl.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/hw/qxl.c b/hw/qxl.c
> index 92e985b..5278541 100644
> --- a/hw/qxl.c
> +++ b/hw/qxl.c
> @@ -1405,6 +1405,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);
>

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 92e985b..5278541 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1405,6 +1405,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);