Prev: [081/139] x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1
Next: [111/139] USB: cdc-acm: Fix stupid NULL pointer in resume()
From: Greg KH on 22 Apr 2010 16:20
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Terry Loftin <terry.loftin(a)hp.com>

commit dac876193cd79ced36d0462749ea47c05844fb49 upstream.

Tx ring buffers after tx_ring->next_to_use are volatile and could
change, possibly causing a crash. Stop cleaning when we hit
tx_ring->next_to_use.

Signed-off-by: Terry Loftin <terry.loftin(a)hp.com>
Acked-by: Bruce Allan <bruce.w.allan(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Cc: Matthew Burgess <matthew(a)linuxfromscratch.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/net/e1000e/netdev.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -660,6 +660,8 @@ static bool e1000_clean_tx_irq(struct e1
i = 0;
}

+ if (i == tx_ring->next_to_use)
+ break;
eop = tx_ring->buffer_info[i].next_to_watch;
eop_desc = E1000_TX_DESC(*tx_ring, eop);
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [081/139] x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1
Next: [111/139] USB: cdc-acm: Fix stupid NULL pointer in resume()