diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-05-30 09:09:19 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-08-05 13:37:21 -0500 |
| commit | 3141be668fa508f08d76de576c381692bccd99ad (patch) | |
| tree | 6de149639f7a924eeb11428676f21922f3bd64fe | |
| parent | 394647d7116703615e0c05a1710c4c77f2b5926a (diff) | |
| download | qemu-3141be668fa508f08d76de576c381692bccd99ad.tar.gz | |
vmsvga: add more fifo checks
Make sure all fifo ptrs are within range.
Fixes: CVE-2016-4454
Cc: qemu-stable@nongnu.org
Cc: P J P <ppandit@redhat.com>
Reported-by: 李强 <liqiang6-s@360.cn>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1464592161-18348-3-git-send-email-kraxel@redhat.com
(cherry picked from commit c2e3c54d3960bc53bfa3a5ce7ea7a050b9be267e)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/display/vmware_vga.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 63a7c05512..a26e62ea8b 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -563,7 +563,10 @@ static inline int vmsvga_fifo_length(struct vmsvga_state_s *s) if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) { return 0; } - if (CMD(max) > SVGA_FIFO_SIZE) { + if (CMD(max) > SVGA_FIFO_SIZE || + CMD(min) >= SVGA_FIFO_SIZE || + CMD(stop) >= SVGA_FIFO_SIZE || + CMD(next_cmd) >= SVGA_FIFO_SIZE) { return 0; } if (CMD(max) < CMD(min) + 10 * 1024) { |