Skip to content

Commit ed4ccce

Browse files
atenartdavem330
authored andcommitted
gro: fix ownership transfer
If packets are GROed with fraglist they might be segmented later on and continue their journey in the stack. In skb_segment_list those skbs can be reused as-is. This is an issue as their destructor was removed in skb_gro_receive_list but not the reference to their socket, and then they can't be orphaned. Fix this by also removing the reference to the socket. For example this could be observed, kernel BUG at include/linux/skbuff.h:3131! (skb_orphan) RIP: 0010:ip6_rcv_core+0x11bc/0x19a0 Call Trace: ipv6_list_rcv+0x250/0x3f0 __netif_receive_skb_list_core+0x49d/0x8f0 netif_receive_skb_list_internal+0x634/0xd40 napi_complete_done+0x1d2/0x7d0 gro_cell_poll+0x118/0x1f0 A similar construction is found in skb_gro_receive, apply the same change there. Fixes: 5e10da5 ("skbuff: allow 'slow_gro' for skb carring sock reference") Signed-off-by: Antoine Tenart <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 3d010c8 commit ed4ccce

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

net/core/gro.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
192192
}
193193

194194
merge:
195-
/* sk owenrship - if any - completely transferred to the aggregated packet */
195+
/* sk ownership - if any - completely transferred to the aggregated packet */
196196
skb->destructor = NULL;
197+
skb->sk = NULL;
197198
delta_truesize = skb->truesize;
198199
if (offset > headlen) {
199200
unsigned int eat = offset - headlen;

net/ipv4/udp_offload.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,9 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
449449
NAPI_GRO_CB(p)->count++;
450450
p->data_len += skb->len;
451451

452-
/* sk owenrship - if any - completely transferred to the aggregated packet */
452+
/* sk ownership - if any - completely transferred to the aggregated packet */
453453
skb->destructor = NULL;
454+
skb->sk = NULL;
454455
p->truesize += skb->truesize;
455456
p->len += skb->len;
456457

0 commit comments

Comments
 (0)