From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 Sep 2024 09:08:20 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.19.322~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a48d2d45a77facbff2024651cc27cd5667098960;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	udp-fix-receiving-fraglist-gso-packets.patch
---

diff --git a/queue-5.15/series b/queue-5.15/series
index 88637cecf31..6335ab93a8f 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -211,3 +211,4 @@ x86-mm-fix-pti-for-i386-some-more.patch
 net-sunrpc-remap-eperm-in-case-of-connection-failure-in-xs_tcp_setup_socket.patch
 btrfs-fix-race-between-direct-io-write-and-fsync-when-using-same-fd.patch
 memcg-protect-concurrent-access-to-mem_cgroup_idr.patch
+udp-fix-receiving-fraglist-gso-packets.patch
diff --git a/queue-5.15/udp-fix-receiving-fraglist-gso-packets.patch b/queue-5.15/udp-fix-receiving-fraglist-gso-packets.patch
new file mode 100644
index 00000000000..dc4ac645885
--- /dev/null
+++ b/queue-5.15/udp-fix-receiving-fraglist-gso-packets.patch
@@ -0,0 +1,34 @@
+From b128ed5ab27330deeeaf51ea8bb69f1442a96f7f Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@nbd.name>
+Date: Mon, 19 Aug 2024 17:06:21 +0200
+Subject: udp: fix receiving fraglist GSO packets
+
+From: Felix Fietkau <nbd@nbd.name>
+
+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@nbd.name>
+Reviewed-by: Willem de Bruijn <willemb@google.com>
+Link: https://patch.msgid.link/20240819150621.59833-1-nbd@nbd.name
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -277,7 +277,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)) {