* [Qemu-devel] [PATCH] vga: fix region calculation
@ 2018-03-08 7:31 Gerd Hoffmann
2018-03-08 8:09 ` P J P
2018-03-08 9:24 ` Ross Lagerwall
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2018-03-08 7:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, P J P, Ross Lagerwall
Typically the scanline length and the line offset are identical. But
case they are not our calculation for region_end is incorrect. Using
line_offset is fine for all scanlines, except the last one where we have
to use the actual scanline length.
Fixes: CVE-2018-<to-be-filled>
Cc: P J P <ppandit@redhat.com>
Cc: Ross Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/vga.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 28f298b342..72181330b8 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -1483,6 +1483,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
region_start = (s->start_addr * 4);
region_end = region_start + (ram_addr_t)s->line_offset * height;
+ region_end += width * s->get_bpp(s) / 8; /* scanline length */
+ region_end -= s->line_offset;
if (region_end > s->vbe_size) {
/* wraps around (can happen with cirrus vbe modes) */
region_start = 0;
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] vga: fix region calculation
2018-03-08 7:31 [Qemu-devel] [PATCH] vga: fix region calculation Gerd Hoffmann
@ 2018-03-08 8:09 ` P J P
2018-03-08 9:24 ` Ross Lagerwall
1 sibling, 0 replies; 3+ messages in thread
From: P J P @ 2018-03-08 8:09 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Ross Lagerwall
+-- On Thu, 8 Mar 2018, Gerd Hoffmann wrote --+
| Typically the scanline length and the line offset are identical.
| But case
But in case ...
| Cc: Ross Lagerwall <ross.lagerwall@citrix.com>
s/Cc:/Reported-by: Ross Lagerwall ...
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| ---
| hw/display/vga.c | 2 ++
| 1 file changed, 2 insertions(+)
|
| diff --git a/hw/display/vga.c b/hw/display/vga.c
| index 28f298b342..72181330b8 100644
| --- a/hw/display/vga.c
| +++ b/hw/display/vga.c
| @@ -1483,6 +1483,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
| region_start = (s->start_addr * 4);
| region_end = region_start + (ram_addr_t)s->line_offset * height;
| + region_end += width * s->get_bpp(s) / 8; /* scanline length */
| + region_end -= s->line_offset;
| if (region_end > s->vbe_size) {
| /* wraps around (can happen with cirrus vbe modes) */
| region_start = 0;
It does help to fix a segmentation fault caused by OOB access.
Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] vga: fix region calculation
2018-03-08 7:31 [Qemu-devel] [PATCH] vga: fix region calculation Gerd Hoffmann
2018-03-08 8:09 ` P J P
@ 2018-03-08 9:24 ` Ross Lagerwall
1 sibling, 0 replies; 3+ messages in thread
From: Ross Lagerwall @ 2018-03-08 9:24 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel; +Cc: P J P
On 03/08/2018 07:31 AM, Gerd Hoffmann wrote:
> Typically the scanline length and the line offset are identical. But
> case they are not our calculation for region_end is incorrect. Using
> line_offset is fine for all scanlines, except the last one where we have
> to use the actual scanline length.
>
> Fixes: CVE-2018-<to-be-filled>
> Cc: P J P <ppandit@redhat.com>
> Cc: Ross Lagerwall <ross.lagerwall@citrix.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
Tested-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Thanks!
--
Ross Lagerwall
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-08 9:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 7:31 [Qemu-devel] [PATCH] vga: fix region calculation Gerd Hoffmann
2018-03-08 8:09 ` P J P
2018-03-08 9:24 ` Ross Lagerwall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.