mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-16 20:23:53 +02:00
182eaa4916
Deleted (reverse-appliable): mediatek/patches-5.10/360-mtd-rawnand-mtk-Fix-WAITRDY-break-condition-and-time.patch Automatically refreshed: ath79/patches-5.10/0036-GPIO-add-named-gpio-exports.patch generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch generic/pending-5.10/600-netfilter_conntrack_flush.patch generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch lantiq/patches-5.10/0030-GPIO-add-named-gpio-exports.patch ramips/patches-5.10/800-GPIO-add-named-gpio-exports.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: netfilter: optional tcp window check
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
--- a/net/netfilter/nf_conntrack_proto_tcp.c
|
|
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
|
|
@@ -31,6 +31,9 @@
|
|
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
|
|
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
|
|
|
|
+/* Do not check the TCP window for incoming packets */
|
|
+static int nf_ct_tcp_no_window_check __read_mostly = 1;
|
|
+
|
|
/* "Be conservative in what you do,
|
|
be liberal in what you accept from others."
|
|
If it's non-zero, we mark only out of window RST segments as INVALID. */
|
|
@@ -476,6 +479,9 @@ static bool tcp_in_window(const struct n
|
|
s32 receiver_offset;
|
|
bool res, in_recv_win;
|
|
|
|
+ if (nf_ct_tcp_no_window_check)
|
|
+ return true;
|
|
+
|
|
/*
|
|
* Get the required data from the packet.
|
|
*/
|
|
@@ -1130,7 +1136,7 @@ int nf_conntrack_tcp_packet(struct nf_co
|
|
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
|
|
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
|
|
timeout = timeouts[TCP_CONNTRACK_UNACK];
|
|
- else if (ct->proto.tcp.last_win == 0 &&
|
|
+ else if (!nf_ct_tcp_no_window_check && ct->proto.tcp.last_win == 0 &&
|
|
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
|
|
timeout = timeouts[TCP_CONNTRACK_RETRANS];
|
|
else
|
|
--- a/net/netfilter/nf_conntrack_standalone.c
|
|
+++ b/net/netfilter/nf_conntrack_standalone.c
|
|
@@ -25,6 +25,9 @@
|
|
#include <net/netfilter/nf_conntrack_timestamp.h>
|
|
#include <linux/rculist_nulls.h>
|
|
|
|
+/* Do not check the TCP window for incoming packets */
|
|
+static int nf_ct_tcp_no_window_check __read_mostly = 1;
|
|
+
|
|
static bool enable_hooks __read_mostly;
|
|
MODULE_PARM_DESC(enable_hooks, "Always enable conntrack hooks");
|
|
module_param(enable_hooks, bool, 0000);
|
|
@@ -652,6 +655,7 @@ enum nf_ct_sysctl_index {
|
|
NF_SYSCTL_CT_PROTO_TIMEOUT_GRE_STREAM,
|
|
#endif
|
|
|
|
+ NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK,
|
|
__NF_SYSCTL_CT_LAST_SYSCTL,
|
|
};
|
|
|
|
@@ -978,6 +982,13 @@ static struct ctl_table nf_ct_sysctl_tab
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
},
|
|
#endif
|
|
+ [NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK] = {
|
|
+ .procname = "nf_conntrack_tcp_no_window_check",
|
|
+ .data = &nf_ct_tcp_no_window_check,
|
|
+ .maxlen = sizeof(unsigned int),
|
|
+ .mode = 0644,
|
|
+ .proc_handler = proc_dointvec,
|
|
+ },
|
|
{}
|
|
};
|
|
|