Commit 41dd30ff authored by Prasad J Pandit's avatar Prasad J Pandit Committed by Michael Roth
Browse files

pvrdma: release ring object in case of an error 



create_cq and create_qp routines allocate ring object, but it's
not released in case of an error, leading to memory leakage.

Reported-by: default avatarLi Qiang <liq3ea@163.com>
Signed-off-by: default avatarPrasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit 509f57c9)
 Conflicts:
	hw/rdma/vmw/pvrdma_cmd.c
*drop dependency on 09178217
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent a1001760

hw/rdma/vmw/pvrdma_cmd.c

+29 −11
Original line number Diff line number Diff line
@@ -315,6 +315,14 @@ out: 
    return rc;

}



static void destroy_cq_ring(PvrdmaRing *ring)

{

    pvrdma_ring_free(ring);

    /* ring_state was in slot 1, not 0 so need to jump back */

    rdma_pci_dma_unmap(ring->dev, --ring->ring_state, TARGET_PAGE_SIZE);

    g_free(ring);

}



static int create_cq(PVRDMADev *dev, union pvrdma_cmd_req *req,

                     union pvrdma_cmd_resp *rsp)

{
@@ -338,6 +346,10 @@ static int create_cq(PVRDMADev *dev, union pvrdma_cmd_req *req, 


    resp->hdr.err = rdma_rm_alloc_cq(&dev->rdma_dev_res, &dev->backend_dev,

                                     cmd->cqe, &resp->cq_handle, ring);

    if (resp->hdr.err) {

        destroy_cq_ring(ring);

    }



    resp->cqe = cmd->cqe;



out:
@@ -361,10 +373,7 @@ static int destroy_cq(PVRDMADev *dev, union pvrdma_cmd_req *req, 
    }



    ring = (PvrdmaRing *)cq->opaque;

    pvrdma_ring_free(ring);

    /* ring_state was in slot 1, not 0 so need to jump back */

    rdma_pci_dma_unmap(PCI_DEVICE(dev), --ring->ring_state, TARGET_PAGE_SIZE);

    g_free(ring);

    destroy_cq_ring(ring);



    rdma_rm_dealloc_cq(&dev->rdma_dev_res, cmd->cq_handle);
@@ -462,6 +471,17 @@ out: 
    return rc;

}



static void destroy_qp_rings(PvrdmaRing *ring)

{

    pr_dbg("sring=%p\n", &ring[0]);

    pvrdma_ring_free(&ring[0]);

    pr_dbg("rring=%p\n", &ring[1]);

    pvrdma_ring_free(&ring[1]);



    rdma_pci_dma_unmap(ring->dev, ring->ring_state, TARGET_PAGE_SIZE);

    g_free(ring);

}



static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req *req,

                     union pvrdma_cmd_resp *rsp)

{
@@ -492,6 +512,10 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, 
                                     cmd->max_send_sge, cmd->send_cq_handle,

                                     cmd->max_recv_wr, cmd->max_recv_sge,

                                     cmd->recv_cq_handle, rings, &resp->qpn);

    if (resp->hdr.err) {

        destroy_qp_rings(rings);

        return rc;

    }



    resp->max_send_wr = cmd->max_send_wr;

    resp->max_recv_wr = cmd->max_recv_wr;
@@ -566,13 +590,7 @@ static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, 
    rdma_rm_dealloc_qp(&dev->rdma_dev_res, cmd->qp_handle);



    ring = (PvrdmaRing *)qp->opaque;

    pr_dbg("sring=%p\n", &ring[0]);

    pvrdma_ring_free(&ring[0]);

    pr_dbg("rring=%p\n", &ring[1]);

    pvrdma_ring_free(&ring[1]);



    rdma_pci_dma_unmap(PCI_DEVICE(dev), ring->ring_state, TARGET_PAGE_SIZE);

    g_free(ring);

    destroy_qp_rings(ring);



    return 0;

}