Re: [PATCH v2] Broadcom CNIC core network driver: fix mem leak onallocation failures in cnic_alloc_uio_rings()

From: Jesper Juhl
Date: Sun Jan 02 2011 - 13:54:42 EST


On Fri, 31 Dec 2010, David Miller wrote:

> From: Jesper Juhl <jj@xxxxxxxxxxxxx>
> 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@xxxxxxxxxxx> for suggesting a better
> > implementation than my initial version.
> >
> >
> > Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
>
> ...
> > + 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.


--
Jesper Juhl <jj@xxxxxxxxxxxxx> http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/