From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932687AbbJMRKs (ORCPT ); Tue, 13 Oct 2015 13:10:48 -0400 Received: from mga03.intel.com ([134.134.136.65]:57194 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932331AbbJMRKr (ORCPT ); Tue, 13 Oct 2015 13:10:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,679,1437462000"; d="scan'208";a="810097546" Subject: Re: [PATCH char-misc-next v3] misc: mic: fix memory leak From: Sudeep Dutt To: Sudip Mukherjee Cc: Sudeep Dutt , Greg Kroah-Hartman , linux-kernel@vger.kernel.org In-Reply-To: <1444755984-6681-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1444755984-6681-1-git-send-email-sudipm.mukherjee@gmail.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 13 Oct 2015 10:08:54 -0700 Message-ID: <1444756134.93285.264.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-30.el6) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-10-13 at 22:36 +0530, Sudip Mukherjee wrote: > 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. > Reviewed-by: Sudeep Dutt Thanks again for the fix. > Signed-off-by: Sudip Mukherjee > --- > > v3: added unmapping the aperture > v2: missed making the function as static > > drivers/misc/mic/scif/scif_nodeqp.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/mic/scif/scif_nodeqp.c b/drivers/misc/mic/scif/scif_nodeqp.c > index 7180d56..c66ca1a 100644 > --- 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); >