skb: Do mix page pool and page referenced frags in GRO

[linux-2.6-block.git] / net / core / gro.c

diff --git a/net/core/gro.c b/net/core/gro.c
index 506f83d715f873c9bc3727e28ace71e00fa79d2f..4bac7ea6e0256542429b630b3cb50a1b4cf4ae06 100644 (file)
--- a/net/core/gro.c
+++ b/net/core/gro.c
@@ -162,6 +162,15 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
        struct sk_buff *lp;
        int segs;
 
+       /* Do not splice page pool based packets w/ non-page pool
+        * packets. This can result in reference count issues as page
+        * pool pages will not decrement the reference count and will
+        * instead be immediately returned to the pool or have frag
+        * count decremented.
+        */
+       if (p->pp_recycle != skb->pp_recycle)
+               return -ETOOMANYREFS;
+
        /* pairs with WRITE_ONCE() in netif_set_gro_max_size() */
        gro_max_size = READ_ONCE(p->dev->gro_max_size);