---

yaml --- r: 133927 b: refs/heads/master c: 81705ad h: refs/heads/master i: 133925: 06cde37 133923: 2da2f50 133919: 861298c v: v3
git-mirror · Jan 30, 2009 · 1926481 · 1926481
1 parent 94f3af6
commit 1926481
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86911732d3996a9da07914b280621450111bb6da
+refs/heads/master: 81705ad1b2f926d2ef15ed95074a9c1fa9fb4dc4
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -2591,9 +2591,11 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 
 	if (skb_shinfo(p)->frag_list)
 		goto merge;
-	else if (skb_headlen(skb) <= skb_gro_offset(skb) &&
-		 skb_shinfo(p)->nr_frags + skb_shinfo(skb)->nr_frags <=
-		 MAX_SKB_FRAGS) {
+	else if (skb_headlen(skb) <= skb_gro_offset(skb)) {
+		if (skb_shinfo(p)->nr_frags + skb_shinfo(skb)->nr_frags >
+		    MAX_SKB_FRAGS)
+			return -E2BIG;
+
 		skb_shinfo(skb)->frags[0].page_offset +=
 			skb_gro_offset(skb) - skb_headlen(skb);
 		skb_shinfo(skb)->frags[0].size -=