Re: [PATCH] et131x: fix allocation failures

[Zhao\, Gang]

Alan, thanks for resending this patch. But it seems you overlooked
something we discussed earlier.

On Mon, 2014-02-17 at 22:13:08 +0800, Alan wrote:
> We should check the ring allocations don't fail.
> If we get a fail we need to clean up properly. The allocator assumes the
> deallocator will be used on failure, but it isn't. Make sure the
> right deallocator is always called and add a missing check against
> fbr allocation failure.
>
> [v2]: Correct check logic
>
> Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
> ---
>  drivers/staging/et131x/et131x.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
> index 6413500..cc600df 100644
> --- a/drivers/staging/et131x/et131x.c
> +++ b/drivers/staging/et131x/et131x.c
> @@ -2124,7 +2124,11 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
>  
>  	/* Alloc memory for the lookup table */
>  	rx_ring->fbr[0] = kmalloc(sizeof(struct fbr_lookup), GFP_KERNEL);
> +	if (rx_ring->fbr[0] == NULL)
> +		return -ENOMEM;
>  	rx_ring->fbr[1] = kmalloc(sizeof(struct fbr_lookup), GFP_KERNEL);
> +	if (rx_ring->fbr[1] == NULL)
> +		return -ENOMEM;

Shouldn't rx_ring->fbr[0] be freed when allocation of rx_ring->fbr[1]
fails ? Or we will leak memory here.

>  
>  	/* The first thing we will do is configure the sizes of the buffer
>  	 * rings. These will change based on jumbo packet support.  Larger
> @@ -2289,7 +2293,7 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
>  	for (id = 0; id < NUM_FBRS; id++) {
>  		fbr = rx_ring->fbr[id];
>  
> -		if (!fbr->ring_virtaddr)
> +		if (!fbr || !fbr->ring_virtaddr)
>  			continue;
>  
>  		/* First the packet memory */
> @@ -3591,6 +3595,7 @@ static int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
>  	if (status) {
>  		dev_err(&adapter->pdev->dev,
>  			  "et131x_tx_dma_memory_alloc FAILED\n");
> +		et131x_tx_dma_memory_free(adapter);
>  		return status;
>  	}
>  	/* Receive buffer memory allocation */
> @@ -3598,7 +3603,7 @@ static int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
>  	if (status) {
>  		dev_err(&adapter->pdev->dev,
>  			  "et131x_rx_dma_memory_alloc FAILED\n");
> -		et131x_tx_dma_memory_free(adapter);
> +		et131x_adapter_memory_free(adapter);
>  		return status;
>  	}
>  
--
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/