Commit ea8d82a1 authored by Jason Baron's avatar Jason Baron Committed by Kevin Wolf
Browse files

ahci: Fix sglist memleak in ahci_dma_rw_buf() 



I noticed that in hw/ide/ahci:ahci_dma_rw_buf() we do not free the sglist. Thus,
I've added a call to qemu_sglist_destroy() to fix this memory leak.

In addition, I've adeed a call in qemu_sglist_destroy() to 0 all of the sglist
fields, in case there is some other codepath that tries to free the sglist.

Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 61f52e06

dma-helpers.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len) 
void qemu_sglist_destroy(QEMUSGList *qsg)

{

    g_free(qsg->sg);

    memset(qsg, 0, sizeof(*qsg));

}



typedef struct {

hw/ide/ahci.c

+3 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,9 @@ static int ahci_dma_rw_buf(IDEDMA *dma, int is_write) 
        dma_buf_write(p, l, &s->sg);

    }



    /* free sglist that was created in ahci_populate_sglist() */

    qemu_sglist_destroy(&s->sg);



    /* update number of transferred bytes */

    ad->cur_cmd->status = cpu_to_le32(le32_to_cpu(ad->cur_cmd->status) + l);

    s->io_buffer_index += l;