dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

e1000: ring buffers resources cleanup

Browse source 
Memory leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: We
should free resources allocated for previous rings if following allocation
fails.

Signed-off-by: Vasily Averin <vvs@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
Vasily Averin 2006-08-28 14:56:24 -07:00 committed by Auke Kok
parent 6dd62ab063
commit 3fbbc72ef1
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/e1000/e1000_main.c
View file

@ -1395,10 +1395,6 @@ setup_tx_desc_die:
* (Descriptors) for all queues * (Descriptors) for all queues
* @adapter: board private structure * @adapter: board private structure
* *
* If this function returns with an error, then it's possible one or
* more of the rings is populated (while the rest are not). It is the
* callers duty to clean those orphaned rings.
*
* Return 0 on success, negative on failure * Return 0 on success, negative on failure
**/ **/
@ -1412,6 +1408,9 @@ e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
if (err) { if (err) {
DPRINTK(PROBE, ERR, DPRINTK(PROBE, ERR,
"Allocation for Tx Queue %u failed\n", i); "Allocation for Tx Queue %u failed\n", i);
for (i-- ; i >= 0; i--)
e1000_free_tx_resources(adapter,
&adapter->tx_ring[i]);
break; break;
} }
} }
@ -1651,10 +1650,6 @@ setup_rx_desc_die:
* (Descriptors) for all queues * (Descriptors) for all queues
* @adapter: board private structure * @adapter: board private structure
* *
* If this function returns with an error, then it's possible one or
* more of the rings is populated (while the rest are not). It is the
* callers duty to clean those orphaned rings.
*
* Return 0 on success, negative on failure * Return 0 on success, negative on failure
**/ **/
@ -1668,6 +1663,9 @@ e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
if (err) { if (err) {
DPRINTK(PROBE, ERR, DPRINTK(PROBE, ERR,
"Allocation for Rx Queue %u failed\n", i); "Allocation for Rx Queue %u failed\n", i);
for (i-- ; i >= 0; i--)
e1000_free_rx_resources(adapter,
&adapter->rx_ring[i]);
break; break;
} }
} }