From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9476B425CFB for ; Fri, 10 Jul 2026 13:43:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783691005; cv=none; b=cnM249u75DCKprnZkiuIOvsSucrdBDmiCe4htcAn4P+tBPhWz4kdmFL8rlKp/d4gRCi+jOgdAmTaNH3oH/riVWxPuJGoUuSLYJ2Ix4otGMpYVeXSgjoR9zRqBO4CRO91PpeDW1NPfyENlO14qn21xBJgqPuktfvvkKk7TVqP8qc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783691005; c=relaxed/simple; bh=4cLp3Nd9t/h63ncK3R8vGWIBlvjRKzd2ACmlTxtnpx8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dnwVCLsKU6u7wD1LgnkdVLsfeSOeAVAtGHHGknzcT8kXZEb0uElUbctE2A15CacMtdN0VSOrQv2jmpQIQVIRARRLhWI3AutXRKo9S7uMPG+uHwNrCdTxR9fzMauajGqfESw69m/IGIkEtApqbGLqWF4JmCJUik0Ew5Pqcw6sY4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.im; spf=pass smtp.mailfrom=fastmail.im; dkim=pass (2048-bit key) header.d=fastmail.im header.i=@fastmail.im header.b=Xq4C/0HY; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Ihd8teGD; arc=none smtp.client-ip=103.168.172.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.im header.i=@fastmail.im header.b="Xq4C/0HY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Ihd8teGD" Received: from phl-compute-08.internal (phl-compute-08.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 9DAB81400114; Fri, 10 Jul 2026 09:43:22 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Fri, 10 Jul 2026 09:43:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.im; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1783691002; x= 1783777402; bh=rZycrF6WDGMO95sKOxHtdI13cNDx2yfbCfkeAW9bNyI=; b=X q4C/0HY2X/MwveSEKOC9iYKs5WA2OkflqewtgSO9ZG3n47PAONevcJgMk8kJfUkx 3Zl2ljQK056lb5Rxfrk5ug1kg2kBrws3DtDZeVZyyynXIUtM3zeOkelEprtyg11n xIuo8N3WGAR9NMrzjUeMvpw0x3tG0NKgqFPvkYyWzW5a1Ee3DX48tHCVaiumxKUk g0Y54UcWC56Y0TCM2sDnM/QjRZYJZ+JfY0UGGhdGHowl2zDLuXdPnY1B/tnJ3Sd9 HVUmUvIk+Jr8hei9evD4lZFs9p6bhcQlvrj5IH22h+2jxL9YCuoAWU981Ev8+T0T rOnvoKCFd0yzLaZgeIKoA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1783691002; x=1783777402; bh=r ZycrF6WDGMO95sKOxHtdI13cNDx2yfbCfkeAW9bNyI=; b=Ihd8teGD9pKkUAoc8 E719HrBPaevI9otaiRL5M0ZwgguG2uzwFEt3mq5rgJlaeO0sNr+tSIVhyV+xTJ6O C0S6bgcpVZWjCaKUlwsZIyB5Cqw1sRjLeDaMVeqW5KYr+dejwMBt1zXZTm+xKGIa wOiTfQsK97NmkOCHHoZkGqA2zDoaU2ipimqqsLK2pjdF2iB258qT6NmIV39pl0Ls DjRqyZ4jowBZTg5us+4sw4IbrARhGdalU6ukXzcmmRrbLYpm7GB2i9Xg/iYx/0Fn jKnvFniEz7i84DLes61ufxQz9mIhQyc+B+GMGK/1Fkxpf48DZ5cqlSzA0WfadKvc ljHWQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTF72YfS5r1mylfmIlm4FifvbvgC0eZx86fs9AXzgUCHP73ulN+7kC910SC0JbsRIb /+BXN/YV1fze9RMM8yLB0XnGM3WKuIlmk/D13XAvMZEKZRgWju9AjyUhtdpPo+zoqIqJGy UrGDMHrrAAZCjPwYOc5VrU7zwC+c9eLuV6hSL2JEDVU/15D+g9/gf7mOupw2OQao2JotTG FVUl0ZFORUdW6me0RDUNotRzg0ZFbe4bevzSnKqmepRdXNqJzEfvW/a9PV/Ll6KIZley+T BnO+ae8TeN20Efco71q2aOf1/WXo0BWkQMIvx/WDpt6g3j6Ss+IWtC0FKFfpI2TWtXRYqm bvBTr21f3Gkv6WpWFKjC2fn+7SVHupskHPEaG0fiHZAnoOO2T88NcrfXgc4vMT4wt7qc12 U/N/hpwMv5YfCHNfUmi7zZ+PTXKQt1Fk2TVHnf0w5RxuX5R47oVIWHjN7BnTSmIDUVjM4k oGaCR9pC+QN2vD0MjBROUuYFrCsk2w3Bk89td7rN3sK8HkpG6gXkhG+ZZ6PCTTEqflIElR 5SutScjwARkwfcCmJ1yprTlt1c3Z4Xs5VoKGnlrWRGJDrgNtV2PZkZ5GZgfavGX+vyegvS /5EATEVgCVQIS+d/aOF9C1up1LsAEdztMYViihGzWnyoWVliBTMQMY99TxwQ X-ME-Proxy: Feedback-ID: i559e4809:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jul 2026 09:43:21 -0400 (EDT) From: Alice Mikityanska To: Daniel Borkmann , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Xin Long , Willem de Bruijn , Willem de Bruijn , David Ahern , Nikolay Aleksandrov Cc: Shuah Khan , Stanislav Fomichev , Andrew Lunn , Simon Horman , Florian Westphal , netdev@vger.kernel.org, Alice Mikityanska Subject: [PATCH net-next v9 4/9] udp: Support gro_ipv4_max_size > 65536 Date: Fri, 10 Jul 2026 16:42:37 +0300 Message-ID: <20260710134242.216538-5-alice.kernel@fastmail.im> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260710134242.216538-1-alice.kernel@fastmail.im> References: <20260710134242.216538-1-alice.kernel@fastmail.im> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Alice Mikityanska Currently, gro_max_size and gro_ipv4_max_size can be set to values bigger than 65536, and GRO will happily aggregate UDP to the configured size (for example, with TCP traffic in VXLAN tunnels). However, udp_gro_complete uses the 16-bit length field in the UDP header to store the length of the aggregated packet. It leads to the packet truncation later in udp_rcv. Fix this by storing 0 to the UDP length field and by restoring the real length from skb->len in udp_rcv. IP GRO already can store 0 to the IP length field, and iph_totlen()/ipv6_payload_len() are capable of restoring the real length, because the relevant packets (BIG TCP tunneled in UDP tunnels) will have skb_is_gso_tcp == true. Additionally, restrict handling uh->len=0 in udpv6_rcv to BIG TCP and jumbograms only by using the udp_get_len helper. Signed-off-by: Alice Mikityanska Reviewed-by: Willem de Bruijn --- net/ipv4/udp.c | 4 ++-- net/ipv4/udp_offload.c | 4 ++-- net/ipv6/udp.c | 4 ++-- net/ipv6/udp_offload.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index cb86124fd963..2b9b55a14758 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2592,8 +2592,8 @@ int udp_rcv(struct sk_buff *skb) struct rtable *rt = skb_rtable(skb); struct net *net = dev_net(skb->dev); struct sock *sk = NULL; - unsigned short ulen; __be32 saddr, daddr; + unsigned int ulen; struct udphdr *uh; bool refcounted; int drop_reason; @@ -2607,7 +2607,7 @@ int udp_rcv(struct sk_buff *skb) goto drop; /* No space for header. */ uh = udp_hdr(skb); - ulen = ntohs(uh->len); + ulen = udp_get_len(skb, uh, 0); saddr = ip_hdr(skb)->saddr; daddr = ip_hdr(skb)->daddr; diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 493e2b9e16fb..4f9a3922937c 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -919,7 +919,7 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff, struct sock *sk; int err; - udp_set_len_short(uh, newlen); + udp_set_len(uh, newlen); sk = INDIRECT_CALL_INET(lookup, udp6_lib_lookup_skb, udp4_lib_lookup_skb, skb, uh->source, uh->dest); @@ -956,7 +956,7 @@ INDIRECT_CALLABLE_SCOPE int udp4_gro_complete(struct sk_buff *skb, int nhoff) /* do fraglist only if there is no outer UDP encap (or we already processed it) */ if (NAPI_GRO_CB(skb)->is_flist && !NAPI_GRO_CB(skb)->encap_mark) { - udp_set_len_short(uh, skb->len - nhoff); + udp_set_len(uh, skb->len - nhoff); skb_shinfo(skb)->gso_type |= (SKB_GSO_FRAGLIST|SKB_GSO_UDP_L4); skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count; diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 8bbd55546b6e..02272466f4c2 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1081,12 +1081,12 @@ INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb) daddr = &ipv6_hdr(skb)->daddr; uh = udp_hdr(skb); - ulen = ntohs(uh->len); + ulen = udp_get_len(skb, uh, 0); if (ulen > skb->len) goto short_packet; /* Check for jumbo payload */ - if (ulen == 0) + if (ulen == 0 && inet6_is_jumbogram(skb)) ulen = skb->len; if (ulen < sizeof(*uh)) diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index c92cf5ee3e6a..7370bcb80332 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -171,7 +171,7 @@ int udp6_gro_complete(struct sk_buff *skb, int nhoff) /* do fraglist only if there is no outer UDP encap (or we already processed it) */ if (NAPI_GRO_CB(skb)->is_flist && !NAPI_GRO_CB(skb)->encap_mark) { - udp_set_len_short(uh, skb->len - nhoff); + udp_set_len(uh, skb->len - nhoff); skb_shinfo(skb)->gso_type |= (SKB_GSO_FRAGLIST|SKB_GSO_UDP_L4); skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count; -- 2.54.0