Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: add missing check for TCP GRO

Browse Source 
Need to check if the skb data buffer is linear up to (and including) the TCP
header.

Fixes: https://github.com/openwrt/openwrt/issues/15359
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-05-03 18:44:57 +02:00
parent 2f5398588a
commit a5a941a997
2 changed files with 10 additions and 8 deletions

9
target/linux/generic/pending-6.1/680-net-add-TCP-fraglist-GRO-support.patch

@ -318,7 +318,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
flush = NAPI_GRO_CB(p)->flush; flush = NAPI_GRO_CB(p)->flush;
flush |= (__force int)(flags & TCP_FLAG_CWR); flush |= (__force int)(flags & TCP_FLAG_CWR);
flush |= (__force int)((flags ^ tcp_flag_word(th2)) & flush |= (__force int)((flags ^ tcp_flag_word(th2)) &
@@ -268,6 +350,18 @@ found: @@ -268,6 +350,19 @@ found:
flush |= p->decrypted ^ skb->decrypted; flush |= p->decrypted ^ skb->decrypted;
#endif #endif
@ -326,6 +326,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
+ flush |= (__force int)(flags ^ tcp_flag_word(th2)); + flush |= (__force int)(flags ^ tcp_flag_word(th2));
+ flush |= skb->ip_summed != p->ip_summed; + flush |= skb->ip_summed != p->ip_summed;
+ flush |= skb->csum_level != p->csum_level; + flush |= skb->csum_level != p->csum_level;
+ flush |= !pskb_may_pull(skb, skb_gro_offset(skb));
+ flush |= NAPI_GRO_CB(p)->count >= 64; + flush |= NAPI_GRO_CB(p)->count >= 64;
+ +
+ if (flush || skb_gro_receive_list(p, skb)) + if (flush || skb_gro_receive_list(p, skb))
@ -337,7 +338,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
if (flush || skb_gro_receive(p, skb)) { if (flush || skb_gro_receive(p, skb)) {
mss = 1; mss = 1;
goto out_check_final; goto out_check_final;
@@ -289,7 +383,6 @@ out_check_final: @@ -289,7 +384,6 @@ out_check_final:
if (p && (!NAPI_GRO_CB(skb)->same_flow || flush)) if (p && (!NAPI_GRO_CB(skb)->same_flow || flush))
pp = p; pp = p;
@ -345,7 +346,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
NAPI_GRO_CB(skb)->flush |= (flush != 0); NAPI_GRO_CB(skb)->flush |= (flush != 0);
return pp; return pp;
@@ -315,18 +408,58 @@ int tcp_gro_complete(struct sk_buff *skb @@ -315,18 +409,58 @@ int tcp_gro_complete(struct sk_buff *skb
} }
EXPORT_SYMBOL(tcp_gro_complete); EXPORT_SYMBOL(tcp_gro_complete);
@ -409,7 +410,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
} }
INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff) INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)
@@ -334,6 +467,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com @@ -334,6 +468,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct tcphdr *th = tcp_hdr(skb); struct tcphdr *th = tcp_hdr(skb);

9
target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch

@ -269,7 +269,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
flush = NAPI_GRO_CB(p)->flush; flush = NAPI_GRO_CB(p)->flush;
flush |= (__force int)(flags & TCP_FLAG_CWR); flush |= (__force int)(flags & TCP_FLAG_CWR);
flush |= (__force int)((flags ^ tcp_flag_word(th2)) & flush |= (__force int)((flags ^ tcp_flag_word(th2)) &
@@ -269,6 +351,18 @@ found: @@ -269,6 +351,19 @@ found:
flush |= p->decrypted ^ skb->decrypted; flush |= p->decrypted ^ skb->decrypted;
#endif #endif
@ -277,6 +277,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
+ flush |= (__force int)(flags ^ tcp_flag_word(th2)); + flush |= (__force int)(flags ^ tcp_flag_word(th2));
+ flush |= skb->ip_summed != p->ip_summed; + flush |= skb->ip_summed != p->ip_summed;
+ flush |= skb->csum_level != p->csum_level; + flush |= skb->csum_level != p->csum_level;
+ flush |= !pskb_may_pull(skb, skb_gro_offset(skb));
+ flush |= NAPI_GRO_CB(p)->count >= 64; + flush |= NAPI_GRO_CB(p)->count >= 64;
+ +
+ if (flush || skb_gro_receive_list(p, skb)) + if (flush || skb_gro_receive_list(p, skb))
@ -288,7 +289,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
if (flush || skb_gro_receive(p, skb)) { if (flush || skb_gro_receive(p, skb)) {
mss = 1; mss = 1;
goto out_check_final; goto out_check_final;
@@ -290,7 +384,6 @@ out_check_final: @@ -290,7 +385,6 @@ out_check_final:
if (p && (!NAPI_GRO_CB(skb)->same_flow || flush)) if (p && (!NAPI_GRO_CB(skb)->same_flow || flush))
pp = p; pp = p;
@ -296,7 +297,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
NAPI_GRO_CB(skb)->flush |= (flush != 0); NAPI_GRO_CB(skb)->flush |= (flush != 0);
return pp; return pp;
@@ -314,18 +407,58 @@ void tcp_gro_complete(struct sk_buff *sk @@ -314,18 +408,58 @@ void tcp_gro_complete(struct sk_buff *sk
} }
EXPORT_SYMBOL(tcp_gro_complete); EXPORT_SYMBOL(tcp_gro_complete);
@ -360,7 +361,7 @@ Signe-off-by: Felix Fietkau <nbd@nbd.name>
} }
INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff) INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)
@@ -333,6 +466,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com @@ -333,6 +467,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct tcphdr *th = tcp_hdr(skb); struct tcphdr *th = tcp_hdr(skb);