mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ide/macio: Fix segfault caused by NULL DMAContext*

Browse Source 
Pass qemu_sglist_init the global dma_context_memory rather than a NULL
pointer; this fixes a segfault in dma_memory_map() when the guest
starts using DMA.

Reported-by: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Peter Maydell 2012-11-20 08:16:51 +00:00 committed by Alexander Graf
parent cab1e8f3e3
commit d688e5239a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/macio.c
View File

@ -76,7 +76,8 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
s->io_buffer_size = io->len; s->io_buffer_size = io->len;
qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL); qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1,
&dma_context_memory);
qemu_sglist_add(&s->sg, io->addr, io->len); qemu_sglist_add(&s->sg, io->addr, io->len);
io->addr += io->len; io->addr += io->len;
io->len = 0; io->len = 0;
@ -132,7 +133,8 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
s->io_buffer_index = 0; s->io_buffer_index = 0;
s->io_buffer_size = io->len; s->io_buffer_size = io->len;
qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL); qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1,
&dma_context_memory);
qemu_sglist_add(&s->sg, io->addr, io->len); qemu_sglist_add(&s->sg, io->addr, io->len);
io->addr += io->len; io->addr += io->len;
io->len = 0; io->len = 0;