net: gro: don't merge zcopy skbs
Subsystems (3)
PATCH 1/1 net: gro: don't merge zcopy skbs
From: Sabrina Dubroca <[email protected]>
commit 4db79a322db8c97f7b73b8a347395ef4d685eb40 upstream.
skb_gro_receive() can currently copy frags between the source and GRO skb, without checking the zerocopy status, and in particular the SKBFL_MANAGED_FRAG_REFS flag.
When SKBFL_MANAGED_FRAG_REFS is set, the skb doesn't hold a reference on the pages in shinfo->frags. Appending those frags to another skb's frags without fixing up the page refcount can lead to UAF.
When either the last skb in the GRO chain (the one we would append frags to) or the source skb is zerocopy, don't merge the skbs.
Fixes 753f1ca4e1e5 ("net: introduce managed frags infrastructure")
Reported-by Huzaifa Sidhpurwala <[email protected]>
Signed-off-by Sabrina Dubroca <[email protected]>
Reviewed-by Willem de Bruijn <[email protected]>
Link https://patch.msgid.link/c3b7f906bbfcbdfd7b4fa9d6c18a438870df85be.1779307748.git.sd@queasysnail.net open here
Signed-off-by Jakub Kicinski <[email protected]>
Signed-off-by Alexander Martyniuk <[email protected]>
---
Backport fix for CVE-2026-46323
net/core/gro.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/gro.c +3 -0
@@ -171,6 +171,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)if (p->pp_recycle != skb->pp_recycle)return -ETOOMANYREFS ; +if (skb_zcopy (p) ||skb_zcopy (skb)) +return -ETOOMANYREFS ; +/* pairs with WRITE_ONCE() in netif_set_gro_max_size() */ gro_max_size =READ_ONCE (p->dev->gro_max_size);
Signature · 1 line
2.30.2