[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: a1e40ac5b5e9077fe1f7ae0eb88034db0f9ae1ab
WARNING: Author mismatch between patch and upstream commit: Backport author: Alexey Nepomnyashihsdl@nppct.ru Commit author: Willem de Bruijnwillemb@google.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: af3122f5fdc0) 6.1.y | Present (different SHA1: 080e6c9a3908) 5.15.y | Not found
Note: The patch differs from the upstream commit: --- 1: a1e40ac5b5e90 ! 1: a211317985866 gso: fix udp gso fraglist segmentation after pull from frag_list @@ Metadata ## Commit message ## gso: fix udp gso fraglist segmentation after pull from frag_list
+ commit a1e40ac5b5e9077fe1f7ae0eb88034db0f9ae1ab upstream. + 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. @@ Commit message Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20241001171752.107580-1-willemdebruijn.kernel@gmail... Signed-off-by: Jakub Kicinski kuba@kernel.org + Signed-off-by: Alexey Nepomnyashih sdl@nppct.ru
## net/ipv4/udp_offload.c ## +@@ + + #include <linux/skbuff.h> + #include <net/udp.h> ++#include <net/ip6_checksum.h> + #include <net/protocol.h> + #include <net/inet_common.h> + @@ net/ipv4/udp_offload.c: struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, - return NULL; - } + __sum16 check; + __be16 newlen;
- if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) - return __udp_gso_segment_list(gso_skb, features, is_ipv6); @@ net/ipv4/udp_offload.c: struct sk_buff *__udp_gso_segment(struct sk_buff *gso_sk + ip_hdr(gso_skb)->daddr, 0); + }
- skb_pull(gso_skb, sizeof(*uh)); - + mss = skb_shinfo(gso_skb)->gso_size; + if (gso_skb->len <= sizeof(*uh) + mss) ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success |