add Cc to devel mailing list
On Wed, 2014-02-05 at 19:56:19 +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. Fix this and add a
> missing check against fbr allocation failure.
>
> 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 e516bb6..26da8c8 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])
Hi, I think it should be:
if (!rx_ring->fbr[1]) {
kfree(rx_ring->fbr[0]);
return -ENOMEM;
}
The other changes seem good.
> + return -ENOMEM;
>
> /* 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;
> }
>
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
