[PATCH] tehuti: possible leak in bdx_probe

[PATCH] tehuti: possible leak in bdx_probe

[Florin Malita]

If pci_enable_device fails, bdx_probe returns without freeing the 
allocated pci_nic structure.

Coverity CID 1908.

Signed-off-by: Florin Malita <fmalita@gmail.com>
---

 drivers/net/tehuti.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 8d04654..4e1b84e 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1906,7 +1906,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
     /************** pci *****************/
 	if ((err = pci_enable_device(pdev)))	/* it trigers interrupt, dunno why. */
-		RET(err);			/* it's not a problem though */
+		goto err_pci;			/* it's not a problem though */
 
 	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
 	    !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
@@ -2076,6 +2076,7 @@ err_out_res:
 	pci_release_regions(pdev);
 err_dma:
 	pci_disable_device(pdev);
+err_pci:
 	vfree(nic);
 
 	RET(err);

RE: [PATCH] tehuti: possible leak in bdx_probe

[Alexander Indenbaum]

> -----Original Message-----
> From: Florin Malita [mailto:fmalita@gmail.com]
> 
> If pci_enable_device fails, bdx_probe returns without freeing the
> allocated pci_nic structure.
> 
> Coverity CID 1908.
> 
> Signed-off-by: Florin Malita <fmalita@gmail.com>

Looks fine to me.

Acked-by: Alexander Indenbaum <baum@tehutinetworks.net>

Thanks!

> ---
> 
>  drivers/net/tehuti.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
> index 8d04654..4e1b84e 100644
> --- a/drivers/net/tehuti.c
> +++ b/drivers/net/tehuti.c
> @@ -1906,7 +1906,7 @@ bdx_probe(struct pci_dev *pdev, const struct
> pci_device_id *ent)
> 
>      /************** pci *****************/
>  	if ((err = pci_enable_device(pdev)))	/* it trigers interrupt,
> dunno why. */
> -		RET(err);			/* it's not a problem though
*/
> +		goto err_pci;			/* it's not a problem though
*/
> 
>  	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
>  	    !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
> @@ -2076,6 +2076,7 @@ err_out_res:
>  	pci_release_regions(pdev);
>  err_dma:
>  	pci_disable_device(pdev);
> +err_pci:
>  	vfree(nic);
> 
>  	RET(err);

Re: [PATCH] tehuti: possible leak in bdx_probe

[Andy Gospodarek]

On Sat, Oct 13, 2007 at 01:03:38PM -0400, Florin Malita wrote:
> If pci_enable_device fails, bdx_probe returns without freeing the 
> allocated pci_nic structure.
> 
> Coverity CID 1908.
> 
> Signed-off-by: Florin Malita <fmalita@gmail.com>
> ---
> 
> drivers/net/tehuti.c |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
> index 8d04654..4e1b84e 100644
> --- a/drivers/net/tehuti.c
> +++ b/drivers/net/tehuti.c
> @@ -1906,7 +1906,7 @@ bdx_probe(struct pci_dev *pdev, const struct 
> pci_device_id *ent)
> 
>     /************** pci *****************/
> 	if ((err = pci_enable_device(pdev)))	/* it trigers interrupt, 
> 	dunno why. */
> -		RET(err);			/* it's not a problem though 
> */
> +		goto err_pci;			/* it's not a problem though 
> */
> 
> 	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
> 	    !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
> @@ -2076,6 +2076,7 @@ err_out_res:
> 	pci_release_regions(pdev);
> err_dma:
> 	pci_disable_device(pdev);
> +err_pci:
> 	vfree(nic);
> 
> 	RET(err);
> 

Good catch.  Thanks!

Acked-by: Andy Gospodarek <andy@greyhouse.net>

Re: [PATCH] tehuti: possible leak in bdx_probe

[Jeff Garzik]

Florin Malita wrote:
> If pci_enable_device fails, bdx_probe returns without freeing the 
> allocated pci_nic structure.
> 
> Coverity CID 1908.
> 
> Signed-off-by: Florin Malita <fmalita@gmail.com>
> ---
> 
> drivers/net/tehuti.c |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

applied