diff --git a/[refs] b/[refs]
index edb95bbdc693..8fa28a524da2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed995bb29f042eece8392d9bae0b83f84bcdb23
+refs/heads/master: 6e15b7124990e4b91645601e7a90d3fe72873336
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index c7b4da1d717f..9b428e423c3d 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/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 @@ static struct sk_buff *sky2_receive(struct sky2_port *sky2,
 
 	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);