qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	lersek@redhat.com, Gerd Hoffmann <kraxel@redhat.com>,
	hqm03ster@gmail.com
Subject: [PATCH v2 5/6] ramfb: add sanity checks to ramfb_create_display_surface
Date: Wed, 29 Apr 2020 13:52:35 +0200	[thread overview]
Message-ID: <20200429115236.28709-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200429115236.28709-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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



  parent reply	other threads:[~2020-04-29 11:56 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29 11:52 [PATCH v2 0/6] ramfb: a bunch of reverts and fixes Gerd Hoffmann
2020-04-29 11:52 ` [PATCH v2 1/6] Revert "hw/display/ramfb: initialize fw-config space with xres/ yres" Gerd Hoffmann
2020-04-29 11:52 ` [PATCH v2 2/6] Revert "hw/display/ramfb: lock guest resolution after it's set" Gerd Hoffmann
2020-04-29 11:52 ` [PATCH v2 3/6] ramfb: drop leftover debug message Gerd Hoffmann
2020-04-29 11:52 ` [PATCH v2 4/6] ramfb: don't update RAMFBState on errors Gerd Hoffmann
2020-04-29 11:52 ` Gerd Hoffmann [this message]
2020-04-29 19:37   ` [PATCH v2 5/6] ramfb: add sanity checks to ramfb_create_display_surface Laszlo Ersek
2020-04-29 11:52 ` [PATCH v2 6/6] ramfb: fix size calculation Gerd Hoffmann
2020-04-29 16:37 ` [PATCH v2 0/6] ramfb: a bunch of reverts and fixes no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200429115236.28709-6-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=hqm03ster@gmail.com \
    --cc=lersek@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).