[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] ramfb: add sanity checks to ramfb_create_display_surface
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 5/6] ramfb: add sanity checks to ramfb_create_display_surface |
Date: |
Wed, 29 Apr 2020 13:52:35 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/ramfb.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c
index eb8b4bc49a2f..be884c9ea837 100644
--- a/hw/display/ramfb.c
+++ b/hw/display/ramfb.c
@@ -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;
}
--
2.18.2
- [PATCH v2 0/6] ramfb: a bunch of reverts and fixes, Gerd Hoffmann, 2020/04/29
- [PATCH v2 3/6] ramfb: drop leftover debug message, Gerd Hoffmann, 2020/04/29
- [PATCH v2 1/6] Revert "hw/display/ramfb: initialize fw-config space with xres/ yres", Gerd Hoffmann, 2020/04/29
- [PATCH v2 4/6] ramfb: don't update RAMFBState on errors, Gerd Hoffmann, 2020/04/29
- [PATCH v2 2/6] Revert "hw/display/ramfb: lock guest resolution after it's set", Gerd Hoffmann, 2020/04/29
- [PATCH v2 5/6] ramfb: add sanity checks to ramfb_create_display_surface,
Gerd Hoffmann <=
- [PATCH v2 6/6] ramfb: fix size calculation, Gerd Hoffmann, 2020/04/29
- Re: [PATCH v2 0/6] ramfb: a bunch of reverts and fixes, no-reply, 2020/04/29