Commit 3fbbc72e authored by Vasily Averin's avatar Vasily Averin Committed by Auke Kok
Browse files

e1000: ring buffers resources cleanup 



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: default avatarVasily Averin <vvs@sw.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 6dd62ab0

drivers/net/e1000/e1000_main.c

+6 −8
Original line number Diff line number Diff line
@@ -1395,10 +1395,6 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter, 
 * 				  (Descriptors) for all queues

 * @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

 **/
@@ -1412,6 +1408,9 @@ e1000_setup_all_tx_resources(struct e1000_adapter *adapter) 
		if (err) {

			DPRINTK(PROBE, ERR,

				"Allocation for Tx Queue %u failed\n", i);

			for (i-- ; i >= 0; i--)

				e1000_free_tx_resources(adapter,

							&adapter->tx_ring[i]);

			break;

		}

	}
@@ -1651,10 +1650,6 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter, 
 * 				  (Descriptors) for all queues

 * @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

 **/
@@ -1668,6 +1663,9 @@ e1000_setup_all_rx_resources(struct e1000_adapter *adapter) 
		if (err) {

			DPRINTK(PROBE, ERR,

				"Allocation for Rx Queue %u failed\n", i);

			for (i-- ; i >= 0; i--)

				e1000_free_rx_resources(adapter,

							&adapter->rx_ring[i]);

			break;

		}

	}