[Xen-changelog] [qemu-upstream-unstable] hw/ide/macio: Fix segfault caused by NULL DMAContext*

[patchbot@xxxxxxx]

commit d688e5239aad2a1f991147974832ce026f78c1a3
Author: Peter Maydell <peter.maydell@xxxxxxxxxx>
Date:   Tue Nov 20 08:16:51 2012 +0000

    hw/ide/macio: Fix segfault caused by NULL DMAContext*
    
    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@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Alexander Graf <agraf@xxxxxxx>
---
 hw/ide/macio.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 720af6e..d2edcc0 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -76,7 +76,8 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
 
     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);
     io->addr += io->len;
     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_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);
     io->addr += io->len;
     io->len = 0;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog