Merge branch 'topic/pcm-dma-fix' into topic/core-change

1 files changed, 2 insertions, 1 deletions

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 80a96166df39..ec85681a7dd8 100644
--- a/net/core/skbuff.c
+++ b/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));