From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 10 Mar 2013 21:59:28 +0000 (+0000)
Subject: cns3xxx: prevent the ethernet driver from accessing uninitialized dma descriptor... 
X-Git-Tag: reboot~11002
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee2b511e1f232487540c79dc120c097c5bd49a37;p=openwrt%2Fstaging%2Fjogo.git

cns3xxx: prevent the ethernet driver from accessing uninitialized dma descriptor entries

SVN-Revision: 35950
---

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 7a5c44cad6..c9040b1647 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;