diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/vmware_vga.c | 11 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 8e9350981c..9354037852 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -488,10 +488,10 @@ static inline int vmsvga_fill_rect(struct vmsvga_state_s *s, #endif struct vmsvga_cursor_definition_s { - int width; - int height; + uint32_t width; + uint32_t height; int id; - int bpp; + uint32_t bpp; int hot_x; int hot_y; uint32_t mask[1024]; @@ -658,7 +658,10 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s) cursor.bpp = vmsvga_fifo_read(s); args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp); - if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask || + if (cursor.width > 256 || + cursor.height > 256 || + cursor.bpp > 32 || + SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask || SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) { goto badcmd; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d1b0e53668..3852ad1967 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1169,6 +1169,7 @@ static int spapr_vga_init(PCIBus *pci_bus) case VGA_DEVICE: return true; case VGA_STD: + case VGA_VIRTIO: return pci_vga_init(pci_bus) != NULL; default: fprintf(stderr, "This vga model is not supported," |