forked from Openwrt/openwrt
456b7a5d48
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From 4498f0aa561092bc656bfabe7c4bdae41bc4a5b4 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
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 <nbd@nbd.name>
|
|
---
|
|
net/ipv4/tcp_offload.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/net/ipv4/tcp_offload.c
|
|
+++ b/net/ipv4/tcp_offload.c
|
|
@@ -367,6 +367,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;
|
|
|
|
if (flush || skb_gro_receive_list(p, skb))
|