diff --git a/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch b/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch deleted file mode 100644 index 4684e045d2d..00000000000 --- a/target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4498f0aa561092bc656bfabe7c4bdae41bc4a5b4 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Tue, 7 May 2024 11:24:50 +0200 -Subject: [PATCH] net: add missing check for TCP fraglist GRO - -It turns out that the existing checks do not guarantee that the skb can be -pulled up to the GRO offset. When using the usb r8152 network driver with -GRO fraglist, the BUG() in __skb_pull is often triggered. -Fix the crash by adding the missing check. - -Fixes: 8d95dc474f85 ("net: add code for TCP fraglist GRO") -Signed-off-by: Felix Fietkau ---- - net/ipv4/tcp_offload.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/ipv4/tcp_offload.c -+++ b/net/ipv4/tcp_offload.c -@@ -355,6 +355,7 @@ struct sk_buff *tcp_gro_receive(struct l - flush |= (__force int)(flags ^ tcp_flag_word(th2)); - flush |= skb->ip_summed != p->ip_summed; - flush |= skb->csum_level != p->csum_level; -+ flush |= !pskb_may_pull(skb, skb_gro_offset(skb)); - flush |= NAPI_GRO_CB(p)->count >= 64; - skb_set_network_header(skb, skb_gro_receive_network_offset(skb)); - diff --git a/target/linux/generic/pending-6.18/690-net-add-missing-check-for-TCP-fraglist-GRO.patch b/target/linux/generic/pending-6.18/690-net-add-missing-check-for-TCP-fraglist-GRO.patch deleted file mode 100644 index 9de4a6056e8..00000000000 --- a/target/linux/generic/pending-6.18/690-net-add-missing-check-for-TCP-fraglist-GRO.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4498f0aa561092bc656bfabe7c4bdae41bc4a5b4 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Tue, 7 May 2024 11:24:50 +0200 -Subject: [PATCH] net: add missing check for TCP fraglist GRO - -It turns out that the existing checks do not guarantee that the skb can be -pulled up to the GRO offset. When using the usb r8152 network driver with -GRO fraglist, the BUG() in __skb_pull is often triggered. -Fix the crash by adding the missing check. - -Fixes: 8d95dc474f85 ("net: add code for TCP fraglist GRO") -Signed-off-by: Felix Fietkau ---- - net/ipv4/tcp_offload.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/ipv4/tcp_offload.c -+++ b/net/ipv4/tcp_offload.c -@@ -359,6 +359,7 @@ struct sk_buff *tcp_gro_receive(struct l - flush |= (__force int)(flags ^ tcp_flag_word(th2)); - flush |= skb->ip_summed != p->ip_summed; - flush |= skb->csum_level != p->csum_level; -+ flush |= !pskb_may_pull(skb, skb_gro_offset(skb)); - flush |= NAPI_GRO_CB(p)->count >= 64; - skb_set_network_header(skb, skb_gro_receive_network_offset(skb)); -