Skip to content

Commit 1c6ca07

Browse files
committed
gso: fix udp gso fraglist segmentation after pull from frag_list
jira VULN-45771 cve CVE-2024-49978 commit-author Willem de Bruijn <willemb@google.com> commit a1e40ac Detect gso fraglist skbs with corrupted geometry (see below) and pass these to skb_segment instead of skb_segment_list, as the first can segment them correctly. Valid SKB_GSO_FRAGLIST skbs - consist of two or more segments - the head_skb holds the protocol headers plus first gso_size - one or more frag_list skbs hold exactly one segment - all but the last must be gso_size Optional datapath hooks such as NAT and BPF (bpf_skb_pull_data) can modify these skbs, breaking these invariants. In extreme cases they pull all data into skb linear. For UDP, this causes a NULL ptr deref in __udpv4_gso_segment_list_csum at udp_hdr(seg->next)->dest. Detect invalid geometry due to pull, by checking head_skb size. Don't just drop, as this may blackhole a destination. Convert to be able to pass to regular skb_segment. Link: https://lore.kernel.org/netdev/20240428142913.18666-1-shiming.cheng@mediatek.com/ Fixes: 9fd1ff5 ("udp: Support UDP fraglist GRO/GSO.") Signed-off-by: Willem de Bruijn <willemb@google.com> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20241001171752.107580-1-willemdebruijn.kernel@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit a1e40ac) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 4db4303 commit 1c6ca07

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

net/ipv4/udp_offload.c

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,26 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
273273
__sum16 check;
274274
__be16 newlen;
275275

276-
if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST)
277-
return __udp_gso_segment_list(gso_skb, features, is_ipv6);
276+
if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) {
277+
/* Detect modified geometry and pass those to skb_segment. */
278+
if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)
279+
return __udp_gso_segment_list(gso_skb, features, is_ipv6);
280+
281+
/* Setup csum, as fraglist skips this in udp4_gro_receive. */
282+
gso_skb->csum_start = skb_transport_header(gso_skb) - gso_skb->head;
283+
gso_skb->csum_offset = offsetof(struct udphdr, check);
284+
gso_skb->ip_summed = CHECKSUM_PARTIAL;
285+
286+
uh = udp_hdr(gso_skb);
287+
if (is_ipv6)
288+
uh->check = ~udp_v6_check(gso_skb->len,
289+
&ipv6_hdr(gso_skb)->saddr,
290+
&ipv6_hdr(gso_skb)->daddr, 0);
291+
else
292+
uh->check = ~udp_v4_check(gso_skb->len,
293+
ip_hdr(gso_skb)->saddr,
294+
ip_hdr(gso_skb)->daddr, 0);
295+
}
278296

279297
mss = skb_shinfo(gso_skb)->gso_size;
280298
if (gso_skb->len <= sizeof(*uh) + mss)

0 commit comments

Comments
 (0)