Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f48883 authored by Alan's avatar Alan Committed by Greg Kroah-Hartman
Browse files

staging: et131x: fix allocation failures 



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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53693d90

drivers/staging/et131x/et131x.c

+7 −2
Original line number Diff line number Diff line
@@ -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;



	/* 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;

	}