misc: mic: fix memory leak

In scif_node_connect() we were returning if the initialization of p2p_ji
fails. But at that time p2p_ij has already been initialized and
resources allocated for it. And since p2p_ij is not added to the list
till now so we will have a leak.
Lets deinitialize and release the resources connected to p2p_ij.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mic/scif/scif_nodeqp.c b/drivers/misc/mic/scif/scif_nodeqp.c
index 7180d566c74b998c7dcdb4c03b399bad703c060a..c66ca1a5814e5b6599feb79a39c0b052ad5eeb6e 100644 (file)
--- a/drivers/misc/mic/scif/scif_nodeqp.c
+++ b/drivers/misc/mic/scif/scif_nodeqp.c
@@ -435,6 +435,21 @@ free_p2p:
        return NULL;
 }
 
+/* Uninitialize and release resources from a p2p mapping */
+static void scif_deinit_p2p_info(struct scif_dev *scifdev,
+                                struct scif_p2p_info *p2p)
+{
+       struct scif_hw_dev *sdev = scifdev->sdev;
+
+       dma_unmap_sg(&sdev->dev, p2p->ppi_sg[SCIF_PPI_MMIO],
+                    p2p->sg_nentries[SCIF_PPI_MMIO], DMA_BIDIRECTIONAL);
+       dma_unmap_sg(&sdev->dev, p2p->ppi_sg[SCIF_PPI_APER],
+                    p2p->sg_nentries[SCIF_PPI_APER], DMA_BIDIRECTIONAL);
+       scif_p2p_freesg(p2p->ppi_sg[SCIF_PPI_MMIO]);
+       scif_p2p_freesg(p2p->ppi_sg[SCIF_PPI_APER]);
+       kfree(p2p);
+}
+
 /**
  * scif_node_connect: Respond to SCIF_NODE_CONNECT interrupt message
  * @dst: Destination node
@@ -477,8 +492,10 @@ static void scif_node_connect(struct scif_dev *scifdev, int dst)
        if (!p2p_ij)
                return;
        p2p_ji = scif_init_p2p_info(dev_j, dev_i);
-       if (!p2p_ji)
+       if (!p2p_ji) {
+               scif_deinit_p2p_info(dev_i, p2p_ij);
                return;
+       }
        list_add_tail(&p2p_ij->ppi_list, &dev_i->p2p);
        list_add_tail(&p2p_ji->ppi_list, &dev_j->p2p);