OSDN Git Service

ramfb: add sanity checks to ramfb_create_display_surface
authorGerd Hoffmann <kraxel@redhat.com>
Wed, 29 Apr 2020 11:52:35 +0000 (13:52 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 18 May 2020 13:43:51 +0000 (15:43 +0200)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 20200429115236.28709-6-kraxel@redhat.com

hw/display/ramfb.c

index 1a20bde..52dae78 100644 (file)
@@ -15,6 +15,7 @@
 #include "qapi/error.h"
 #include "hw/loader.h"
 #include "hw/display/ramfb.h"
+#include "hw/display/bochs-vbe.h" /* for limits */
 #include "ui/console.h"
 #include "sysemu/reset.h"
 
@@ -49,6 +50,11 @@ static DisplaySurface *ramfb_create_display_surface(int width, int height,
     hwaddr size;
     void *data;
 
+    if (width < 16 || width > VBE_DISPI_MAX_XRES ||
+        height < 16 || height > VBE_DISPI_MAX_YRES ||
+        format == 0 /* unknown format */)
+        return NULL;
+
     if (linesize == 0) {
         linesize = width * PIXMAN_FORMAT_BPP(format) / 8;
     }