Skip to content

Commit 8d82077

Browse files
CIQ Kernel Automationroxanan1996
authored andcommitted
gro: fix ownership transfer
jira VULN-37821 cve CVE-2024-35890 commit-author Antoine Tenart <atenart@kernel.org> commit ed4ccce 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 <atenart@kernel.org> Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit ed4ccce) Signed-off-by: CIQ Kernel Automation <ciq_kernel_automation@ciq.com>
1 parent 1b3845f commit 8d82077

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

net/core/gro.c

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

243243
merge:
244-
/* sk owenrship - if any - completely transferred to the aggregated packet */
244+
/* sk ownership - if any - completely transferred to the aggregated packet */
245245
skb->destructor = NULL;
246+
skb->sk = NULL;
246247
delta_truesize = skb->truesize;
247248
if (offset > headlen) {
248249
unsigned int eat = offset - headlen;

net/ipv4/udp_offload.c

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

467-
/* sk owenrship - if any - completely transferred to the aggregated packet */
467+
/* sk ownership - if any - completely transferred to the aggregated packet */
468468
skb->destructor = NULL;
469+
skb->sk = NULL;
469470
p->truesize += skb->truesize;
470471
p->len += skb->len;
471472

0 commit comments

Comments
 (0)