From: Felix Fietkau <nbd@xxxxxxxx>
commit b128ed5ab27330deeeaf51ea8bb69f1442a96f7f upstream.
When assembling fraglist GSO packets, udp4_gro_complete does not set
skb->csum_start, which makes the extra validation in __udp_gso_segment fail.
Fixes: 89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr")
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Reviewed-by: Willem de Bruijn <willemb@xxxxxxxxxx>
Link: https://patch.msgid.link/20240819150621.59833-1-nbd@xxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/ipv4/udp_offload.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -278,7 +278,8 @@ struct sk_buff *__udp_gso_segment(struct
return ERR_PTR(-EINVAL);
if (unlikely(skb_checksum_start(gso_skb) !=
- skb_transport_header(gso_skb)))
+ skb_transport_header(gso_skb) &&
+ !(skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST)))
return ERR_PTR(-EINVAL);
if (skb_gso_ok(gso_skb, features | NETIF_F_GSO_ROBUST)) {
Patches currently in stable-queue which might be from nbd@xxxxxxxx are
queue-6.1/wifi-cfg80211-fix-receiving-mesh-packets-without-rfc1042-header.patch
queue-6.1/wifi-mac80211-fix-potential-null-pointer-dereference.patch
queue-6.1/udp-fix-receiving-fraglist-gso-packets.patch
queue-6.1/wifi-mac80211-fix-mesh-path-discovery-based-on-unicast-packets.patch
queue-6.1/wifi-mac80211-fix-mesh-forwarding.patch
queue-6.1/wifi-mac80211-fix-receiving-a-msdu-frames-on-mesh-in.patch
queue-6.1/wifi-mac80211-fix-flow-dissection-for-forwarded-packets.patch
queue-6.1/wifi-mac80211-drop-bogus-static-keywords-in-a-msdu-rx.patch
queue-6.1/wifi-cfg80211-factor-out-bridge-tunnel-rfc1042-heade.patch
queue-6.1/wifi-mac80211-fix-receiving-mesh-packets-in-forwarding-0-networks.patch
queue-6.1/wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch
queue-6.1/wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch
queue-6.1/wifi-cfg80211-move-a-msdu-check-in-ieee80211_data_to.patch
queue-6.1/wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch
