---

yaml --- r: 168763 b: refs/heads/master c: 69c0cab h: refs/heads/master i: 168761: db43620 168759: 0a10d70 v: v3
git-mirror · Nov 17, 2009 · bb7c4d8 · bb7c4d8
1 parent 94c6529
commit bb7c4d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e54d5512b600aa0d492010436ff7eb0c9194efc1
+refs/heads/master: 69c0cab120a85471054614418b447349caba22d7
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -2701,7 +2701,8 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 
 		NAPI_GRO_CB(skb)->free = 1;
 		goto done;
-	}
+	} else if (skb_gro_len(p) != pinfo->gso_size)
+		return -E2BIG;
 
 	headroom = skb_headroom(p);
 	nskb = netdev_alloc_skb(p->dev, headroom + skb_gro_offset(p));