From bb7c4d81b10ee6f762985e18a5291941582a8804 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 17 Nov 2009 05:18:18 -0800
Subject: [PATCH] --- yaml --- r: 168763 b: refs/heads/master c:
 69c0cab120a85471054614418b447349caba22d7 h: refs/heads/master i:   168761:
 db43620446bfbba2cd6c07995e3d5a9c79832eae   168759:
 0a10d70ef2bec46aaf7c2c8b5c3db328ed8eeb24 v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4ed90bc6f06a..c886052a222a 100644
--- 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
index 80a96166df39..ec85681a7dd8 100644
--- 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));