diff options
| author | linzhecheng <linzhecheng@huawei.com> | 2018-01-11 21:27:24 +0800 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2018-02-12 19:19:25 -0600 |
| commit | 63112b16a6abd31d40df2b9a1dd713b42eb59c6b (patch) | |
| tree | a1483f4dffdaa58d3c9ff7070332b62dd5844718 | |
| parent | 30c3b4823c34a7410ec86c8e8b42db56b7b11117 (diff) | |
| download | qemu-63112b16a6abd31d40df2b9a1dd713b42eb59c6b.zip qemu-63112b16a6abd31d40df2b9a1dd713b42eb59c6b.tar.gz qemu-63112b16a6abd31d40df2b9a1dd713b42eb59c6b.tar.bz2 | |
vga: check the validation of memory addr when draw text
Start a vm with qemu-kvm -enable-kvm -vnc :66 -smp 1 -m 1024 -hda
redhat_5.11.qcow2 -device pcnet -vga cirrus,
then use VNC client to connect to VM, and excute the code below in guest
OS will lead to qemu crash:
int main()
{
iopl(3);
srand(time(NULL));
int a,b;
while(1){
a = rand()%0x100;
b = 0x3c0 + (rand()%0x20);
outb(a,b);
}
return 0;
}
The above code is writing the registers of VGA randomly.
We can write VGA CRT controller registers index 0x0C or 0x0D
(which is the start address register) to modify the
the display memory address of the upper left pixel
or character of the screen. The address may be out of the
range of vga ram. So we should check the validation of memory address
when reading or writing it to avoid segfault.
Signed-off-by: linzhecheng <linzhecheng@huawei.com>
Message-id: 20180111132724.13744-1-linzhecheng@huawei.com
Fixes: CVE-2018-5683
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 191f59dc17396bb5a8da50f8c59b6e0a430711a4)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/display/vga.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index a64a094..d150a3a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1280,6 +1280,9 @@ static void vga_draw_text(VGACommonState *s, int full_update) cx_min = width; cx_max = -1; for(cx = 0; cx < width; cx++) { + if (src + sizeof(uint16_t) > s->vram_ptr + s->vram_size) { + break; + } ch_attr = *(uint16_t *)src; if (full_update || ch_attr != *ch_attr_ptr || src == cursor_ptr) { if (cx < cx_min) |