Bladeren bron

[PATCH] sky2: handle hardware packet overrun

It is possible for hardware to get confused when an oversized frame
is received. In that case, just drop the packet and increment a counter.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Stephen Hemminger 19 jaren geleden
bovenliggende
commit
6e15b71249
1 gewijzigde bestanden met toevoegingen van 9 en 0 verwijderingen
  1. 9 0
      drivers/net/sky2.c

+ 9 - 0
drivers/net/sky2.c

@@ -1694,6 +1694,9 @@ static struct sk_buff *sky2_receive(struct sky2_port *sky2,
 	if (!(status & GMR_FS_RX_OK))
 		goto resubmit;
 
+	if ((status >> 16) != length || length > sky2->rx_bufsize)
+		goto oversize;
+
 	if (length < copybreak) {
 		skb = alloc_skb(length + 2, GFP_ATOMIC);
 		if (!skb)
@@ -1735,7 +1738,13 @@ resubmit:
 
 	return skb;
 
+oversize:
+	++sky2->net_stats.rx_over_errors;
+	goto resubmit;
+
 error:
+	++sky2->net_stats.rx_errors;
+
 	if (netif_msg_rx_err(sky2))
 		printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
 		       sky2->netdev->name, status, length);