From 9f2ecab7f43f9078d1136582524629551427c8dd Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 10 Mar 2013 21:59:28 +0000 Subject: cns3xxx: prevent the ethernet driver from accessing uninitialized dma descriptor entries git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35950 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target') diff --git a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c index 7a5c44cad..c9040b164 100644 --- a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c +++ b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c @@ -619,8 +619,9 @@ static int eth_poll(struct napi_struct *napi, int budget) unsigned int length; unsigned int i = rx_ring->cur_index; struct rx_desc *desc = &(rx_ring)->desc[i]; + unsigned int alloc_count = rx_ring->alloc_count; - while (desc->cown) { + while (desc->cown && alloc_count + received < RX_DESCS - 1) { struct sk_buff *skb; int reserve = SKB_HEAD_ALIGN; -- cgit v1.2.3