Message ID | alpine.LNX.2.00.1012262154420.20797@swampdragon.chaosbits.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Jesper Juhl wrote: > > We are leaking memory in drivers/net/cnic.c::cnic_alloc_uio_rings() if > either of the calls to dma_alloc_coherent() fail. This patch fixes it > by > freeing both the memory allocated with kzalloc() and memory allocated > with > previous calls to dma_alloc_coherent() when there's a failure. > > Thanks to Joe Perches <joe@perches.com> for suggesting a better > implementation than my initial version. > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net> Thanks. Acked-by: Michael Chan <mchan@broadcom.com> > --- > cnic.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > compile tested only since I don't have the hardware to do a proper > test. > > diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c > index 92bac19..952afac 100644 > --- a/drivers/net/cnic.c > +++ b/drivers/net/cnic.c > @@ -940,7 +940,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev > *dev, int pages) > &udev->l2_ring_map, > GFP_KERNEL | __GFP_COMP); > if (!udev->l2_ring) > - return -ENOMEM; > + goto err_udev; > > udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp- > >l2_single_buf_size; > udev->l2_buf_size = PAGE_ALIGN(udev->l2_buf_size); > @@ -948,7 +948,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev > *dev, int pages) > &udev->l2_buf_map, > GFP_KERNEL | __GFP_COMP); > if (!udev->l2_buf) > - return -ENOMEM; > + goto err_dma; > > write_lock(&cnic_dev_lock); > list_add(&udev->list, &cnic_udev_list); > @@ -959,6 +959,12 @@ static int cnic_alloc_uio_rings(struct cnic_dev > *dev, int pages) > cp->udev = udev; > > return 0; > + err_dma: > + dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size, > + udev->l2_ring, udev->l2_ring_map); > + err_udev: > + kfree(udev); > + return -ENOMEM; > } > > static int cnic_init_uio(struct cnic_dev *dev) > > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jesper Juhl <jj@chaosbits.net> Date: Sun, 26 Dec 2010 21:57:39 +0100 (CET) > We are leaking memory in drivers/net/cnic.c::cnic_alloc_uio_rings() if > either of the calls to dma_alloc_coherent() fail. This patch fixes it by > freeing both the memory allocated with kzalloc() and memory allocated with > previous calls to dma_alloc_coherent() when there's a failure. > > Thanks to Joe Perches <joe@perches.com> for suggesting a better > implementation than my initial version. > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net> ... > + err_dma: > + dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size, > + udev->l2_ring, udev->l2_ring_map); Space before tab in indentation, improperly positioned third argument indentation. I fixed all of this up, but please do not skimp on making sure these details are taken care of when updating your patch in response to feedback. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 31 Dec 2010, David Miller wrote: > From: Jesper Juhl <jj@chaosbits.net> > Date: Sun, 26 Dec 2010 21:57:39 +0100 (CET) > > > We are leaking memory in drivers/net/cnic.c::cnic_alloc_uio_rings() if > > either of the calls to dma_alloc_coherent() fail. This patch fixes it by > > freeing both the memory allocated with kzalloc() and memory allocated with > > previous calls to dma_alloc_coherent() when there's a failure. > > > > Thanks to Joe Perches <joe@perches.com> for suggesting a better > > implementation than my initial version. > > > > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net> > > ... > > + err_dma: > > + dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size, > > + udev->l2_ring, udev->l2_ring_map); > > Space before tab in indentation, improperly positioned third argument > indentation. > Whoops. > I fixed all of this up, but please do not skimp on making sure these > details are taken care of when updating your patch in response to feedback. > I usually try to take care that such things are in order. I often even point these details out to other people. It slipped past me this time. That was a mistake. Sorry.
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 92bac19..952afac 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -940,7 +940,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) &udev->l2_ring_map, GFP_KERNEL | __GFP_COMP); if (!udev->l2_ring) - return -ENOMEM; + goto err_udev; udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size; udev->l2_buf_size = PAGE_ALIGN(udev->l2_buf_size); @@ -948,7 +948,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) &udev->l2_buf_map, GFP_KERNEL | __GFP_COMP); if (!udev->l2_buf) - return -ENOMEM; + goto err_dma; write_lock(&cnic_dev_lock); list_add(&udev->list, &cnic_udev_list); @@ -959,6 +959,12 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) cp->udev = udev; return 0; + err_dma: + dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size, + udev->l2_ring, udev->l2_ring_map); + err_udev: + kfree(udev); + return -ENOMEM; } static int cnic_init_uio(struct cnic_dev *dev)