298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-14 09:52:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

shortcut-fe: fix tcp_no_window_check api with kernel 5.15.43+

Browse Source
This commit is contained in:
lean 2022-06-07 19:05:57 +08:00
parent 7b60931f79
commit 1cb98d7be6
5 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/shortcut-fe/fast-classifier/Makefile
View File

@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fast-classifier PKG_NAME:=fast-classifier
PKG_RELEASE:=2 PKG_RELEASE:=3
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

4
package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c
View File

@ -453,6 +453,7 @@ static int fast_classifier_update_protocol(struct sfe_connection_create *p_sic,
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
struct net *net=NULL ; struct net *net=NULL ;
struct nf_tcp_net *tn=NULL;
#endif #endif
switch (p_sic->protocol) { switch (p_sic->protocol) {
case IPPROTO_TCP: case IPPROTO_TCP:
@ -466,7 +467,8 @@ static int fast_classifier_update_protocol(struct sfe_connection_create *p_sic,
p_sic->dest_td_max_end = ct->proto.tcp.seen[1].td_maxend; p_sic->dest_td_max_end = ct->proto.tcp.seen[1].td_maxend;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
net = nf_ct_net(ct); net = nf_ct_net(ct);
if ((net&&net->ct.sysctl_no_window_check) tn = nf_tcp_pernet(net);
if ((tn&&tn->tcp_no_window_check)
#else #else
if (nf_ct_tcp_no_window_check if (nf_ct_tcp_no_window_check
#endif #endif

2
package/lean/shortcut-fe/shortcut-fe/Makefile
View File

@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=shortcut-fe PKG_NAME:=shortcut-fe
PKG_RELEASE:=3 PKG_RELEASE:=5
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

4
package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c
View File

@ -314,6 +314,7 @@ static unsigned int sfe_cm_post_routing(struct sk_buff *skb, int is_v4)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
struct net *net=NULL; struct net *net=NULL;
struct nf_tcp_net *tn=NULL;
#endif #endif
/* /*
@ -502,7 +503,8 @@ static unsigned int sfe_cm_post_routing(struct sk_buff *skb, int is_v4)
sic.dest_td_max_end = ct->proto.tcp.seen[1].td_maxend; sic.dest_td_max_end = ct->proto.tcp.seen[1].td_maxend;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
net = nf_ct_net(ct); net = nf_ct_net(ct);
if ((net&&net->ct.sysctl_no_window_check) tn = nf_tcp_pernet(net);
if ((tn&&tn->tcp_no_window_check)
#else #else
if (nf_ct_tcp_no_window_check if (nf_ct_tcp_no_window_check
#endif #endif

84
target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
View File

@ -2,6 +2,7 @@ From: Felix Fietkau <nbd@nbd.name>
Subject: netfilter: optional tcp window check Subject: netfilter: optional tcp window check
Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- ---
net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++ net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++
1 file changed, 13 insertions(+) 1 file changed, 13 insertions(+)
@ -12,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
s32 receiver_offset; s32 receiver_offset;
bool res, in_recv_win; bool res, in_recv_win;
+ if (net->ct.sysctl_no_window_check) + if (tn->tcp_no_window_check)
+ return true; + return true;
+ +
/* /*
@ -23,57 +24,60 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK]; timeout = timeouts[TCP_CONNTRACK_UNACK];
- else if (ct->proto.tcp.last_win == 0 && - else if (ct->proto.tcp.last_win == 0 &&
+ else if (!net->ct.sysctl_no_window_check && ct->proto.tcp.last_win == 0 && + else if (!tn->tcp_no_window_check && ct->proto.tcp.last_win == 0 &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
timeout = timeouts[TCP_CONNTRACK_RETRANS]; timeout = timeouts[TCP_CONNTRACK_RETRANS];
else else
@@ -1476,6 +1479,9 @@ void nf_conntrack_tcp_init_net(struct ne
*/
tn->tcp_be_liberal = 0;
+ /* Skip Windows Check */
+ tn->tcp_no_window_check = 0;
+
/* If it's non-zero, we turn off RST sequence number check */
tn->tcp_ignore_invalid_rst = 0;
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -671,6 +671,7 @@ enum nf_ct_sysctl_index { @@ -633,6 +633,7 @@ enum nf_ct_sysctl_index {
NF_SYSCTL_CT_LWTUNNEL,
#endif #endif
NF_SYSCTL_CT_PROTO_TCP_LOOSE,
NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
+ NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK, + NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK,
__NF_SYSCTL_CT_LAST_SYSCTL, NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
}; NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
NF_SYSCTL_CT_PROTO_TIMEOUT_UDP,
@@ -1026,6 +1027,13 @@ static struct ctl_table nf_ct_sysctl_tab @@ -849,6 +850,14 @@ static struct ctl_table nf_ct_sysctl_tab
.proc_handler = nf_hooks_lwtunnel_sysctl_handler, .extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
}, },
#endif
+ [NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK] = { + [NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK] = {
+ .procname = "nf_conntrack_tcp_no_window_check", + .procname = "nf_conntrack_tcp_no_window_check",
+ .data = &init_net.ct.sysctl_no_window_check, + .maxlen = sizeof(u8),
+ .maxlen = sizeof(unsigned int),
+ .mode = 0644, + .mode = 0644,
+ .proc_handler = proc_dointvec, + .proc_handler = proc_dou8vec_minmax,
+ .extra1 = SYSCTL_ZERO,
+ .extra2 = SYSCTL_ONE,
+ }, + },
{} [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
}; .procname = "nf_conntrack_tcp_ignore_invalid_rst",
.maxlen = sizeof(u8),
@@ -1065,6 +1074,7 @@ static void nf_conntrack_standalone_init
@@ -1153,6 +1161,7 @@ static int nf_conntrack_standalone_init_ XASSIGN(LOOSE, &tn->tcp_loose);
#ifdef CONFIG_NF_CONNTRACK_EVENTS XASSIGN(LIBERAL, &tn->tcp_be_liberal);
table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events; + XASSIGN(NO_WINDOW_CHECK, &tn->tcp_no_window_check);
#endif XASSIGN(MAX_RETRANS, &tn->tcp_max_retrans);
+ table[NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK].data = &net->ct.sysctl_no_window_check; XASSIGN(IGNORE_INVALID_RST, &tn->tcp_ignore_invalid_rst);
#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP #undef XASSIGN
table[NF_SYSCTL_CT_TIMESTAMP].data = &net->ct.sysctl_tstamp;
#endif
@@ -1222,6 +1231,7 @@ static int nf_conntrack_pernet_init(stru
int ret;
net->ct.sysctl_checksum = 1;
+ net->ct.sysctl_no_window_check = 1;
ret = nf_conntrack_standalone_init_sysctl(net);
if (ret < 0)
--- a/include/net/netns/conntrack.h --- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h
@@ -109,6 +109,7 @@ struct netns_ct { @@ -26,6 +26,7 @@ struct nf_tcp_net {
u8 sysctl_auto_assign_helper; unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX];
u8 sysctl_tstamp; u8 tcp_loose;
u8 sysctl_checksum; u8 tcp_be_liberal;
+ u8 sysctl_no_window_check; + u8 tcp_no_window_check;
u8 tcp_max_retrans;
struct ct_pcpu __percpu *pcpu_lists; u8 tcp_ignore_invalid_rst;
struct ip_conntrack_stat __percpu *stat; #if IS_ENABLED(CONFIG_NF_FLOW_TABLE)