Commit 51568923 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'spice/spice.v47' into staging 

* spice/spice.v47:
  qxl: Slot sanity check in qxl_phys2virt() is off by one, fix
parents a75e6678 6b7332eb

hw/qxl.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id) 
    case MEMSLOT_GROUP_HOST:

        return (void*)offset;

    case MEMSLOT_GROUP_GUEST:

        PANIC_ON(slot > NUM_MEMSLOTS);

        PANIC_ON(slot >= NUM_MEMSLOTS);

        PANIC_ON(!qxl->guest_slots[slot].active);

        PANIC_ON(offset < qxl->guest_slots[slot].delta);

        offset -= qxl->guest_slots[slot].delta;