net-gro: Fix GRO flush when receiving a GSO packet.

[mirror_ubuntu-bionic-kernel.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index d1820b1de0f9dd61338a11188f069700b7c38f32..8f37d184f60006db7cde26c1885b0e6df27822d2 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3807,7 +3807,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
        struct sk_buff *lp, *p = *head;
        unsigned int delta_truesize;
 
-       if (unlikely(p->len + len >= 65536))
+       if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;
 
        lp = NAPI_GRO_CB(p)->last;