evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: et131x: fix allocation failures

Browse source 
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@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan 2014-02-17 14:13:08 +00:00 • committed by Greg Kroah-Hartman
parent 53693d9068
commit a9f488831c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/et131x/et131x.c
View file

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