Commit 95c318f5 authored by Gleb Natapov's avatar Gleb Natapov Committed by Blue Swirl
Browse files

Fix segfault in mmio subpage handling code. 



It is possible that subpage mmio is registered over existing memory
page. When this happens "memory" will have real memory address and not
index into io_mem array so next access to the page will generate
segfault. It is uncommon to have some part of a page to be accessed as
memory and some as mmio, but qemu shouldn't crash even when guest does
stupid things. So lets just pretend that the rest of the page is
unassigned if guest configure part of the memory page as mmio.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 9e84a470

exec.c

+2 −0
Original line number Diff line number Diff line
@@ -3293,6 +3293,8 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, 
    printf("%s: %p start %08x end %08x idx %08x eidx %08x mem %ld\n", __func__,

           mmio, start, end, idx, eidx, memory);

#endif

    if ((memory & ~TARGET_PAGE_MASK) == IO_MEM_RAM)

        memory = IO_MEM_UNASSIGNED;

    memory = (memory >> IO_MEM_SHIFT) & (IO_MEM_NB_ENTRIES - 1);

    for (; idx <= eidx; idx++) {

        mmio->sub_io_index[idx] = memory;