Commit 282c6a2f authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Stefano Stabellini
Browse files

xen_disk: fix memory leak 



On ioreq_release the full ioreq was memset to 0, loosing all the data
and memory allocations inside the QEMUIOVector, which leads to a
memory leak. Create a new function to specifically reset ioreq.

Reported-by: default avatarMaik Wessler <maik.wessler@yahoo.com>
Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent a507db95

hw/xen_disk.c

+26 −2
Original line number Diff line number Diff line
@@ -112,6 +112,31 @@ struct XenBlkDev { 


/* ------------------------------------------------------------- */



static void ioreq_reset(struct ioreq *ioreq)

{

    memset(&ioreq->req, 0, sizeof(ioreq->req));

    ioreq->status = 0;

    ioreq->start = 0;

    ioreq->presync = 0;

    ioreq->postsync = 0;

    ioreq->mapped = 0;



    memset(ioreq->domids, 0, sizeof(ioreq->domids));

    memset(ioreq->refs, 0, sizeof(ioreq->refs));

    ioreq->prot = 0;

    memset(ioreq->page, 0, sizeof(ioreq->page));

    ioreq->pages = NULL;



    ioreq->aio_inflight = 0;

    ioreq->aio_errors = 0;



    ioreq->blkdev = NULL;

    memset(&ioreq->list, 0, sizeof(ioreq->list));

    memset(&ioreq->acct, 0, sizeof(ioreq->acct));



    qemu_iovec_reset(&ioreq->v);

}



static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)

{

    struct ioreq *ioreq = NULL;
@@ -129,7 +154,6 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) 
        /* get one from freelist */

        ioreq = QLIST_FIRST(&blkdev->freelist);

        QLIST_REMOVE(ioreq, list);

        qemu_iovec_reset(&ioreq->v);

    }

    QLIST_INSERT_HEAD(&blkdev->inflight, ioreq, list);

    blkdev->requests_inflight++;
@@ -153,7 +177,7 @@ static void ioreq_release(struct ioreq *ioreq, bool finish) 
    struct XenBlkDev *blkdev = ioreq->blkdev;



    QLIST_REMOVE(ioreq, list);

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

    ioreq_reset(ioreq);

    ioreq->blkdev = blkdev;

    QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list);

    if (finish) {